Avoid auto linkage if user uses cmake (#131)

* Refs #16246. Avoid auto linkage if user uses cmake Signed-off-by: Ricardo González <[email protected]> * Refs #16246. Joining properties Signed-off-by: Ricardo González <[email protected]> * Refs #16246. Revert generator expressions usage Signed-off-by: Ricardo González <[email protected]> * Refs #16246. Joining properties Signed-off-by: Ricardo González <[email protected]> * Refs #16246. Fix usage of cmake generator expression Signed-off-by: Ricardo González <[email protected]> --------- Signed-off-by: Ricardo González <[email protected]>
eProsima · Mar 8, 2023 · a794ed0 · a794ed0
1 parent 327ecb2
commit a794ed0
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -49,10 +49,19 @@ elseif(NOT EPROSIMA_INSTALLER)
     # Create library
     add_library(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES})
     set_common_compile_options(${PROJECT_NAME})
-    set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
-    set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+        VERSION ${PROJECT_VERSION}
+        SOVERSION ${PROJECT_VERSION_MAJOR}
+        )
 
-    target_compile_definitions(${PROJECT_NAME} PRIVATE ${PROJECT_NAME_UPPER}_SOURCE)
+    target_compile_definitions(${PROJECT_NAME}
+        PRIVATE
+        ${PROJECT_NAME_UPPER}_SOURCE
+	INTERFACE
+        $<$<BOOL:${WIN32}>:${PROJECT_NAME_UPPER}_NO_LIB>
+        PUBLIC
+	$<$<STREQUAL:$<TARGET_PROPERTY:${PROJECT_NAME},TYPE>,SHARED_LIBRARY>:${PROJECT_NAME_UPPER}_DYN_LINK>
+        )
 
     # Define public headers
     target_include_directories(${PROJECT_NAME} PUBLIC
@@ -61,23 +70,24 @@ elseif(NOT EPROSIMA_INSTALLER)
         )
 
     if(MSVC OR MSVC_IDE)
-        set_target_properties(${PROJECT_NAME} PROPERTIES RELEASE_POSTFIX -${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
-        set_target_properties(${PROJECT_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX -${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
-        set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX d-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+            RELEASE_POSTFIX -${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+            RELWITHDEBINFO_POSTFIX -${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+            DEBUG_POSTFIX d-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+	    )
 
         get_target_property(TARGET_TYPE ${PROJECT_NAME} TYPE)
         if(TARGET_TYPE STREQUAL "SHARED_LIBRARY")
             # Export symbols in DLL library
-            target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME_UPPER}_DYN_LINK)
             set_target_properties(${PROJECT_NAME} PROPERTIES
-                PDB_NAME_DEBUG "${PROJECT_NAME}d-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+                PDB_NAME_DEBUG ${PROJECT_NAME}d-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
                 PDB_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}/symbols"
             )
         else()
             # Rename the library to have a "lib" before.
-            set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME lib${PROJECT_NAME})
             set_target_properties(${PROJECT_NAME} PROPERTIES
-                COMPILE_PDB_NAME_DEBUG "lib${PROJECT_NAME}d-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+                OUTPUT_NAME lib${PROJECT_NAME}
+                COMPILE_PDB_NAME_DEBUG lib${PROJECT_NAME}d-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
                 COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}/symbols"
             )
         endif()