Corrections for Linux platform

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8a9b3e2e54b23bfa236d31e854ebb3ba9ffcad6..136da1656fd30add5f9f440c4ef483c5b03c7a9b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1100,8 +1100,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
       set (SET_OpenCASCADE_3RDPARTY "${SET_OpenCASCADE_3RDPARTY}set (3RDPARTY_${CMAKE_MATCH_1}_DLL_${OCCT_CONFIGURATION_UPPER} \"${3RDPARTY_${CMAKE_MATCH_1}_DLL}\")\n")
     endif()
     string (REGEX MATCH "^3RDPARTY_([^_]*)_LIBRARY$" LIB_FOUND ${ALL_VAR})
+    if (NOT WIN32)
+      set (IS_DYNAMIC_LIBRARY "TRUE")
+    else ()
+      set (IS_DYNAMIC_LIBRARY "FALSE")
+    endif()
     if (LIB_FOUND)
-      set (SET_OpenCASCADE_3RDPARTY "${SET_OpenCASCADE_3RDPARTY}CREATE_IMPORTED_TARGET (${CMAKE_MATCH_1} ${OCCT_CONFIGURATION_UPPER} \"${3RDPARTY_${CMAKE_MATCH_1}_LIBRARY}\" FALSE)\n")
+      set (SET_OpenCASCADE_3RDPARTY "${SET_OpenCASCADE_3RDPARTY}CREATE_IMPORTED_TARGET (${CMAKE_MATCH_1} ${OCCT_CONFIGURATION_UPPER} \"${3RDPARTY_${CMAKE_MATCH_1}_LIBRARY}\" ${IS_DYNAMIC_LIBRARY})\n")
       set (SET_OpenCASCADE_3RDPARTY "${SET_OpenCASCADE_3RDPARTY}set (3RDPARTY_${CMAKE_MATCH_1}_LIBRARY_${OCCT_CONFIGURATION_UPPER} \"${3RDPARTY_${CMAKE_MATCH_1}_LIBRARY}\")\n")
     endif()
     string (REGEX MATCH "^3RDPARTY_([^_]*_INCLUDE_DIR$)" INC_FOUND ${ALL_VAR})

diff --git a/adm/templates/OpenCASCADE3rdparty.cmake.in b/adm/templates/OpenCASCADE3rdparty.cmake.in
index f0a854fccc7076f535695f0d11d209c1879218aa..cb8a5ff83427d078902eb46bfab58d34c271c083 100644 (file)
--- a/adm/templates/OpenCASCADE3rdparty.cmake.in
+++ b/adm/templates/OpenCASCADE3rdparty.cmake.in
@@ -19,7 +19,7 @@ macro (CREATE_IMPORTED_TARGET TARGET_NAME CONFIGURATION TARGET_LIBRARY_FILE_PATH
     set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIGURATION})
   endif()
 
-  if (IS_DYNAMIC_LIBRARY)
+  if (${IS_DYNAMIC_LIBRARY})
     # Add *.dll(Windows)/*.so(Linux)/*.dylib(MacOS) library to the target
     if (NOT "${TARGET_LIBRARY_FILE_PATH}" STREQUAL "")
       set_target_properties(${TARGET_NAME} PROPERTIES IMPORTED_LOCATION_${CONFIGURATION} "${TARGET_LIBRARY_FILE_PATH}")