Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21270] Support compilation againt Ubuntu 24.04 swig4.1 #153

Merged
merged 2 commits into from
Jul 4, 2024
Merged

[21270] Support compilation againt Ubuntu 24.04 swig4.1 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef0c3af
Refs #21268. Compilation againt swig4.1
richiware Jun 28, 2024
621242f
Refs #21268. Regenerate code
richiware Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion fastdds_python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ endif()
# Dependencies
###############################################################################

find_package(SWIG REQUIRED)
find_package(SWIG)
if (NOT SWIG_FOUND)
# Trick to find swig4.1 in Ubuntu noble.
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
find_package(SWIG REQUIRED)
endif()

include(${SWIG_USE_FILE})
set(CMAKE_SWIG_FLAGS "")

Expand Down
21 changes: 18 additions & 3 deletions fastdds_python/test/types/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ target_link_libraries(${PROJECT_NAME}
###############################################################################
# Python bindings for type

find_package(SWIG REQUIRED)
find_package(SWIG)
if (NOT SWIG_FOUND)
# Trick to find swig4.1 in Ubuntu noble.
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
find_package(SWIG REQUIRED)
endif()
include(${SWIG_USE_FILE})
set(CMAKE_SWIG_FLAGS "")

Expand Down Expand Up @@ -148,7 +153,12 @@ target_link_libraries(${PROJECT_NAME}
###############################################################################
# Python bindings for type

find_package(SWIG REQUIRED)
find_package(SWIG)
if (NOT SWIG_FOUND)
# Trick to find swig4.1 in Ubuntu noble.
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
find_package(SWIG REQUIRED)
endif()
include(${SWIG_USE_FILE})
set(CMAKE_SWIG_FLAGS "")

Expand Down Expand Up @@ -249,7 +259,12 @@ target_link_libraries(${PROJECT_NAME}
###############################################################################
# Python bindings for type

find_package(SWIG REQUIRED)
find_package(SWIG)
if (NOT SWIG_FOUND)
# Trick to find swig4.1 in Ubuntu noble.
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
find_package(SWIG REQUIRED)
endif()
include(${SWIG_USE_FILE})
set(CMAKE_SWIG_FLAGS "")

Expand Down
7 changes: 6 additions & 1 deletion fastdds_python_examples/HelloWorldExample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ target_link_libraries(${PROJECT_NAME}
###############################################################################
# Python bindings for type

find_package(SWIG REQUIRED)
find_package(SWIG)
if (NOT SWIG_FOUND)
# Trick to find swig4.1 in Ubuntu noble.
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
find_package(SWIG REQUIRED)
endif()
include(${SWIG_USE_FILE})
set(CMAKE_SWIG_FLAGS "")

Expand Down