Refs #18687. Fixing swig error on windows

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Sep 27, 2023 · 6a831fa · 6a831fa
1 parent 360f475
commit 6a831fa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -98,7 +98,7 @@ jobs:
         if: always()
 
   ubuntu-build-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2

diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt
@@ -36,6 +36,7 @@ set(CMAKE_SWIG_FLAGS "")
 
 find_package (Python3 COMPONENTS Interpreter Development REQUIRED)
 
+find_package(fastcdr 2 REQUIRED)
 find_package(fastrtps 2.12 REQUIRED)
 
 ###############################################################################

diff --git a/fastdds_python/colcon.pkg b/fastdds_python/colcon.pkg
@@ -1,5 +1,5 @@
 {
     "name": "fastdds_python",
     "type": "cmake",
-    "build-dependencies": ["fastcdr", "fastrtps"]
+    "build-dependencies": ["fastrtps"]
 }
diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt
@@ -51,6 +51,7 @@ endif()
 
 SWIG_LINK_LIBRARIES(${PROJECT_NAME}
     Python3::Module
+    fastcdr
     fastrtps
     )
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ endif() @@
     SWIG_LINK_LIBRARIES(${PROJECT_NAME}
         Python3::Module
+        fastcdr
         fastrtps
         )
@@ Expand Down @@