From 17d3eb0615bf8a0a51de0e64296aaac54f1f8415 Mon Sep 17 00:00:00 2001 From: Keane Wong Date: Thu, 20 Feb 2025 11:36:20 -0800 Subject: [PATCH 1/6] Set CMAKE_SHARED_LIBRARY_SUFFIX to always create .so files. --- fastdds_python/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index ee8503a4..120356a2 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -25,6 +25,7 @@ if(POLICY CMP0086) endif() project(fastdds_python VERSION 2.4.0) +set(CMAKE_SHARED_LIBRARY_SUFFIX .so) # Set BUILD_TESTING to OFF by default. if(NOT BUILD_TESTING) From 2e2e880da96394e0b4d72a09b24336cc7e395703 Mon Sep 17 00:00:00 2001 From: danipiza Date: Wed, 30 Jul 2025 11:55:48 +0200 Subject: [PATCH 2/6] [#23543] Added cmake option and default suffix for platforms Signed-off-by: danipiza --- fastdds_python/CMakeLists.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index 120356a2..345a09ec 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -25,7 +25,20 @@ if(POLICY CMP0086) endif() project(fastdds_python VERSION 2.4.0) -set(CMAKE_SHARED_LIBRARY_SUFFIX .so) + +if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") +else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(WIN32) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() +endif() # Set BUILD_TESTING to OFF by default. if(NOT BUILD_TESTING) From 8d5468bce9dd27faaa78d0dca02be3696b895ddb Mon Sep 17 00:00:00 2001 From: danipiza Date: Wed, 30 Jul 2025 12:14:43 +0200 Subject: [PATCH 3/6] [#23543] Added cmake option for Python test and examples Signed-off-by: danipiza --- fastdds_python/CMakeLists.txt | 4 +- fastdds_python/test/types/CMakeLists.txt | 42 +++++++++++++++++++ .../generated_code/CMakeLists.txt | 14 +++++++ .../RPCExample/generated_code/CMakeLists.txt | 14 +++++++ 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index 345a09ec..c06f946f 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -27,8 +27,10 @@ endif() project(fastdds_python VERSION 2.4.0) if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + message(STATUS "ADDED ARGUMENT: .${SHARED_LIBRARY_SUFFIX}") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") else() + message(STATUS "NO ARGUMENT: DEFAULT VALUE") # Default values for shared library suffix if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt index 3809a1be..1a78c5a4 100644 --- a/fastdds_python/test/types/CMakeLists.txt +++ b/fastdds_python/test/types/CMakeLists.txt @@ -41,6 +41,20 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") +else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(WIN32) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() +endif() + #Create library for C++ types add_library(${PROJECT_NAME} SHARED test_included_modulesTypeObjectSupport.cxx @@ -146,6 +160,20 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") +else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(WIN32) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() +endif() + #Create library for C++ types add_library(${PROJECT_NAME} SHARED test_modulesTypeObjectSupport.cxx @@ -251,6 +279,20 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") +else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(WIN32) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() +endif() + #Create library for C++ types add_library(${PROJECT_NAME} SHARED test_completeTypeObjectSupport.cxx diff --git a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt index ead5e629..ce02e52e 100644 --- a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt @@ -41,6 +41,20 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") +else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(WIN32) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() +endif() + #Create library for C++ types add_library(${PROJECT_NAME} SHARED HelloWorldTypeObjectSupport.cxx diff --git a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt index 79382f18..69bb9103 100644 --- a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt @@ -41,6 +41,20 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") +else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(WIN32) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() +endif() + #Create library for C++ types add_library(${PROJECT_NAME} SHARED calculatorTypeObjectSupport.cxx From 061f3d25baf5ddcf1bacedb7bf2e024737c23e83 Mon Sep 17 00:00:00 2001 From: danipiza Date: Wed, 20 Aug 2025 08:33:19 +0200 Subject: [PATCH 4/6] [#23543] Default value for Windows OS Signed-off-by: danipiza --- fastdds_python/CMakeLists.txt | 24 ++++--- fastdds_python/test/types/CMakeLists.txt | 66 +++++++++---------- .../generated_code/CMakeLists.txt | 22 +++---- .../RPCExample/generated_code/CMakeLists.txt | 22 +++---- 4 files changed, 66 insertions(+), 68 deletions(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index c06f946f..e6538007 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -26,19 +26,17 @@ endif() project(fastdds_python VERSION 2.4.0) -if(SHARED_LIBRARY_SUFFIX) - message(STATUS "ADDED ARGUMENT: .${SHARED_LIBRARY_SUFFIX}") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") -else() - message(STATUS "NO ARGUMENT: DEFAULT VALUE") - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(WIN32) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") +if(NOT WIN32) + if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() endif() endif() diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt index 1a78c5a4..8bdd304b 100644 --- a/fastdds_python/test/types/CMakeLists.txt +++ b/fastdds_python/test/types/CMakeLists.txt @@ -41,17 +41,17 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") -else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(WIN32) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") +if(NOT WIN32) + if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() endif() endif() @@ -160,17 +160,17 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") -else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(WIN32) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") +if(NOT WIN32) + if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() endif() endif() @@ -279,17 +279,17 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") -else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(WIN32) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") +if(NOT WIN32) + if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() endif() endif() diff --git a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt index ce02e52e..bb3af2ec 100644 --- a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt @@ -41,17 +41,17 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") -else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(WIN32) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") +if(NOT WIN32) + if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() endif() endif() diff --git a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt index 69bb9103..37dd93f5 100644 --- a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt @@ -41,17 +41,17 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") -else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(WIN32) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") +if(NOT WIN32) + if(SHARED_LIBRARY_SUFFIX) + set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") + else() + + # Default values for shared library suffix + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") + endif() endif() endif() From 9fcf24415b83f1f668b490063c9ddf27ad01855c Mon Sep 17 00:00:00 2001 From: danipiza Date: Mon, 22 Sep 2025 07:10:12 +0200 Subject: [PATCH 5/6] [#23543] Review changes Signed-off-by: danipiza --- fastdds_python/CMakeLists.txt | 13 ++----- fastdds_python/test/types/CMakeLists.txt | 39 +++++-------------- .../generated_code/CMakeLists.txt | 13 ++----- .../RPCExample/generated_code/CMakeLists.txt | 13 ++----- 4 files changed, 18 insertions(+), 60 deletions(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index e6538007..44dad5f5 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -27,16 +27,9 @@ endif() project(fastdds_python VERSION 2.4.0) if(NOT WIN32) - if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") - else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - endif() + # Default values for shared library suffix in MacOS + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif() endif() diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt index 8bdd304b..12ad5204 100644 --- a/fastdds_python/test/types/CMakeLists.txt +++ b/fastdds_python/test/types/CMakeLists.txt @@ -42,16 +42,9 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(NOT WIN32) - if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") - else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - endif() + # Default values for shared library suffix in MacOS + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif() endif() @@ -161,16 +154,9 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(NOT WIN32) - if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") - else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - endif() + # Default values for shared library suffix in MacOS + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif() endif() @@ -280,16 +266,9 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(NOT WIN32) - if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") - else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - endif() + # Default values for shared library suffix in MacOS + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif() endif() diff --git a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt index bb3af2ec..1e857efb 100644 --- a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt @@ -42,16 +42,9 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(NOT WIN32) - if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") - else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - endif() + # Default values for shared library suffix in MacOS + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif() endif() diff --git a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt index 37dd93f5..d00b75e0 100644 --- a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt @@ -42,16 +42,9 @@ find_package(fastdds 3 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(NOT WIN32) - if(SHARED_LIBRARY_SUFFIX) - set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}") - else() - - # Default values for shared library suffix - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") - endif() + # Default values for shared library suffix in MacOS + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") endif() endif() From 739e7d9d880f70550067b4c7c7a208d65dcef253 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Thu, 25 Sep 2025 09:25:07 +0200 Subject: [PATCH 6/6] Refs #23543. Regenerate code with Fast DDS Gen from related PR. Signed-off-by: Miguel Company --- fastdds_python/test/types/test_complete.i | 15 +++++++++++++++ fastdds_python/test/types/test_modules.i | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i index accb8723..80daaa60 100644 --- a/fastdds_python/test/types/test_complete.i +++ b/fastdds_python/test/types/test_complete.i @@ -233,6 +233,11 @@ namespace swig { eprosima::fastcdr::fixed_string<16> tmp(value); $self->fixed_string_field(tmp); } + + std::string fixed_string_field_str() const + { + return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16)); + } } @@ -444,6 +449,11 @@ namespace swig { eprosima::fastcdr::fixed_string<16> tmp(value); $self->fixed_string_field(tmp); } + + std::string fixed_string_field_str() const + { + return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16)); + } } @@ -1699,6 +1709,11 @@ namespace swig { eprosima::fastcdr::fixed_string<16> tmp(value); $self->fixed_string_field(tmp); } + + std::string fixed_string_field_str() const + { + return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16)); + } } diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i index 5b4c32a0..ce8a42ad 100644 --- a/fastdds_python/test/types/test_modules.i +++ b/fastdds_python/test/types/test_modules.i @@ -232,6 +232,11 @@ namespace swig { eprosima::fastcdr::fixed_string<16> tmp(value); $self->fixed_string_field(tmp); } + + std::string fixed_string_field_str() const + { + return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16)); + } } @@ -432,6 +437,11 @@ namespace swig { eprosima::fastcdr::fixed_string<16> tmp(value); $self->fixed_string_field(tmp); } + + std::string fixed_string_field_str() const + { + return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16)); + } } @@ -1687,6 +1697,11 @@ namespace swig { eprosima::fastcdr::fixed_string<16> tmp(value); $self->fixed_string_field(tmp); } + + std::string fixed_string_field_str() const + { + return std::string($self->fixed_string_field(), strnlen($self->fixed_string_field(), 16)); + } }