]> OCCT Git - occt.git/commitdiff
0031667: Configuration, CMake - Dependencies between targets are not specified for... CR31667_1
authorkgv <kgv@opencascade.com>
Sat, 26 Feb 2022 18:02:22 +0000 (21:02 +0300)
committerkgv <kgv@opencascade.com>
Sat, 26 Feb 2022 18:31:08 +0000 (21:31 +0300)
target_link_libraries() is now set with public interface for CMake >= 3.

adm/cmake/occt_toolkit.cmake

index 2f96c6f148797184dd80ba1f26767a585af24340..90f33c20436203d1c725fc2f3b3cef40543bbdcd 100644 (file)
@@ -400,6 +400,12 @@ if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
   if(IS_VTK_9XX)
     string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
   endif()
+endif()
+
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.0.0")
+  # Declare the dependencies public so that all code that uses this library automatically also links with the dependencies
+  target_link_libraries (${PROJECT_NAME} PUBLIC ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+elseif (BUILD_SHARED_LIBS)
   target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
 endif()