Skip to content

Commit e8b3367

Browse files
DanipizaDanipiza
committed
[#23543] Default value for Windows OS
Signed-off-by: danipiza <dpizarrogallego@gmail.com>
1 parent 13dd65c commit e8b3367

File tree

4 files changed

+66
-68
lines changed

4 files changed

+66
-68
lines changed

‎fastdds_python/CMakeLists.txt‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,17 @@ endif()
2626

2727
project(fastdds_python VERSION 2.4.0)
2828

29-
if(SHARED_LIBRARY_SUFFIX)
30-
message(STATUS "ADDED ARGUMENT: .${SHARED_LIBRARY_SUFFIX}")
31-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
32-
else()
33-
message(STATUS "NO ARGUMENT: DEFAULT VALUE")
34-
35-
# Default values for shared library suffix
36-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
37-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
38-
elseif(WIN32)
39-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib")
40-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS
41-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
29+
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()
4240
endif()
4341
endif()
4442

‎fastdds_python/test/types/CMakeLists.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ find_package(fastdds 3 REQUIRED)
4141

4242
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
4343

44-
if(SHARED_LIBRARY_SUFFIX)
45-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
46-
else()
47-
48-
# Default values for shared library suffix
49-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
50-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
51-
elseif(WIN32)
52-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib")
53-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS
54-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
44+
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()
5555
endif()
5656
endif()
5757

@@ -160,17 +160,17 @@ find_package(fastdds 3 REQUIRED)
160160

161161
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
162162

163-
if(SHARED_LIBRARY_SUFFIX)
164-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
165-
else()
166-
167-
# Default values for shared library suffix
168-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
169-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
170-
elseif(WIN32)
171-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib")
172-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS
173-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
163+
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()
174174
endif()
175175
endif()
176176

@@ -279,17 +279,17 @@ find_package(fastdds 3 REQUIRED)
279279

280280
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
281281

282-
if(SHARED_LIBRARY_SUFFIX)
283-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
284-
else()
285-
286-
# Default values for shared library suffix
287-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
288-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
289-
elseif(WIN32)
290-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib")
291-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS
292-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
282+
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()
293293
endif()
294294
endif()
295295

‎fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ find_package(fastdds 3 REQUIRED)
4141

4242
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
4343

44-
if(SHARED_LIBRARY_SUFFIX)
45-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
46-
else()
47-
48-
# Default values for shared library suffix
49-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
50-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
51-
elseif(WIN32)
52-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib")
53-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS
54-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
44+
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()
5555
endif()
5656
endif()
5757

‎fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ find_package(fastdds 3 REQUIRED)
4141

4242
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
4343

44-
if(SHARED_LIBRARY_SUFFIX)
45-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".${SHARED_LIBRARY_SUFFIX}")
46-
else()
47-
48-
# Default values for shared library suffix
49-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
50-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
51-
elseif(WIN32)
52-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".lib")
53-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # macOS
54-
set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
44+
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()
5555
endif()
5656
endif()
5757

0 commit comments

Comments
 (0)