Support compilation againt Ubuntu 24.04 swig4.1 (#153)

* Refs #21268. Compilation againt swig4.1 Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21268. Regenerate code Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Jul 4, 2024 · 577f1ee · 577f1ee
1 parent 93c94a1
commit 577f1ee
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt
@@ -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 "")
 

diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt
@@ -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 "")
 
@@ -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 "")
 
@@ -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 "")
 

diff --git a/fastdds_python_examples/HelloWorldExample/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/CMakeLists.txt
@@ -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 "")