Skip to content

Commit 577f1ee

Browse files
authored
Support compilation againt Ubuntu 24.04 swig4.1 (#153)
* Refs #21268. Compilation againt swig4.1 Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #21268. Regenerate code Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 93c94a1 commit 577f1ee

3 files changed

Lines changed: 31 additions & 5 deletions

File tree

fastdds_python/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ endif()
3636
# Dependencies
3737
###############################################################################
3838

39-
find_package(SWIG REQUIRED)
39+
find_package(SWIG)
40+
if (NOT SWIG_FOUND)
41+
# Trick to find swig4.1 in Ubuntu noble.
42+
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
43+
find_package(SWIG REQUIRED)
44+
endif()
45+
4046
include(${SWIG_USE_FILE})
4147
set(CMAKE_SWIG_FLAGS "")
4248

fastdds_python/test/types/CMakeLists.txt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ target_link_libraries(${PROJECT_NAME}
4848
###############################################################################
4949
# Python bindings for type
5050

51-
find_package(SWIG REQUIRED)
51+
find_package(SWIG)
52+
if (NOT SWIG_FOUND)
53+
# Trick to find swig4.1 in Ubuntu noble.
54+
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
55+
find_package(SWIG REQUIRED)
56+
endif()
5257
include(${SWIG_USE_FILE})
5358
set(CMAKE_SWIG_FLAGS "")
5459

@@ -148,7 +153,12 @@ target_link_libraries(${PROJECT_NAME}
148153
###############################################################################
149154
# Python bindings for type
150155

151-
find_package(SWIG REQUIRED)
156+
find_package(SWIG)
157+
if (NOT SWIG_FOUND)
158+
# Trick to find swig4.1 in Ubuntu noble.
159+
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
160+
find_package(SWIG REQUIRED)
161+
endif()
152162
include(${SWIG_USE_FILE})
153163
set(CMAKE_SWIG_FLAGS "")
154164

@@ -249,7 +259,12 @@ target_link_libraries(${PROJECT_NAME}
249259
###############################################################################
250260
# Python bindings for type
251261

252-
find_package(SWIG REQUIRED)
262+
find_package(SWIG)
263+
if (NOT SWIG_FOUND)
264+
# Trick to find swig4.1 in Ubuntu noble.
265+
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
266+
find_package(SWIG REQUIRED)
267+
endif()
253268
include(${SWIG_USE_FILE})
254269
set(CMAKE_SWIG_FLAGS "")
255270

fastdds_python_examples/HelloWorldExample/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ target_link_libraries(${PROJECT_NAME}
4848
###############################################################################
4949
# Python bindings for type
5050

51-
find_package(SWIG REQUIRED)
51+
find_package(SWIG)
52+
if (NOT SWIG_FOUND)
53+
# Trick to find swig4.1 in Ubuntu noble.
54+
find_program(SWIG_EXECUTABLE NAMES swig4.1 swig)
55+
find_package(SWIG REQUIRED)
56+
endif()
5257
include(${SWIG_USE_FILE})
5358
set(CMAKE_SWIG_FLAGS "")
5459

0 commit comments

Comments
 (0)