Skip to content

Commit 36d257a

Browse files
DanipizaDanipiza
committed
[#23543] Review changes
Signed-off-by: danipiza <dpizarrogallego@gmail.com>
1 parent e8b3367 commit 36d257a

4 files changed

Lines changed: 18 additions & 60 deletions

File tree

‎fastdds_python/CMakeLists.txt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,9 @@ endif()
2727
project(fastdds_python VERSION 2.4.0)
2828

2929
if(NOT WIN32)
30-
if(SHARED_LIBRARY_SUFFIX)
31-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
32-
else()
33-
34-
# Default values for shared library suffix
35-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
36-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
37-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
38-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
39-
endif()
30+
# Default values for shared library suffix in MacOS
31+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
32+
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
4033
endif()
4134
endif()
4235

‎fastdds_python/test/types/CMakeLists.txt‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,9 @@ find_package(fastdds 3 REQUIRED)
4242
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
4343

4444
if(NOT WIN32)
45-
if(SHARED_LIBRARY_SUFFIX)
46-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
47-
else()
48-
49-
# Default values for shared library suffix
50-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
51-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
52-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
53-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
54-
endif()
45+
# Default values for shared library suffix in MacOS
46+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
47+
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
5548
endif()
5649
endif()
5750

@@ -161,16 +154,9 @@ find_package(fastdds 3 REQUIRED)
161154
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
162155

163156
if(NOT WIN32)
164-
if(SHARED_LIBRARY_SUFFIX)
165-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
166-
else()
167-
168-
# Default values for shared library suffix
169-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
170-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
171-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
172-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
173-
endif()
157+
# Default values for shared library suffix in MacOS
158+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
159+
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
174160
endif()
175161
endif()
176162

@@ -280,16 +266,9 @@ find_package(fastdds 3 REQUIRED)
280266
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
281267

282268
if(NOT WIN32)
283-
if(SHARED_LIBRARY_SUFFIX)
284-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
285-
else()
286-
287-
# Default values for shared library suffix
288-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
289-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
290-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
291-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
292-
endif()
269+
# Default values for shared library suffix in MacOS
270+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
271+
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
293272
endif()
294273
endif()
295274

‎fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,9 @@ find_package(fastdds 3 REQUIRED)
4242
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
4343

4444
if(NOT WIN32)
45-
if(SHARED_LIBRARY_SUFFIX)
46-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
47-
else()
48-
49-
# Default values for shared library suffix
50-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
51-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
52-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
53-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
54-
endif()
45+
# Default values for shared library suffix in MacOS
46+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
47+
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
5548
endif()
5649
endif()
5750

‎fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,9 @@ find_package(fastdds 3 REQUIRED)
4242
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
4343

4444
if(NOT WIN32)
45-
if(SHARED_LIBRARY_SUFFIX)
46-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
47-
else()
48-
49-
# Default values for shared library suffix
50-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
51-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
52-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
53-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
54-
endif()
45+
# Default values for shared library suffix in MacOS
46+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
47+
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
5548
endif()
5649
endif()
5750

0 commit comments

Comments
 (0)