0029266: CMake install does not copy pdb files in Debug mode due to the changes in...

OCCT_INSTALL_BIN_LETTER is used only on Windows (isn't depended on type of generator) because bind/libd/bini/libi folders are not used on Linux (only bin and lib)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4987c1a77e5224f174519753598221df7de27e9f..2dbe95ff2c69761218eebbb0dc2415b85dd5af33 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1095,10 +1095,6 @@ if (APPLE)
   set (SET_OpenCASCADE_WITH_GLX "set (OpenCASCADE_WITH_GLX       ${USE_GLX})")
 endif()
 
-if (NOT SINGLE_GENERATOR)
-  OCCT_INSERT_CODE_FOR_TARGET()
-endif()
-
 # Configure and install cmake config file
 configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
 install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION  "${INSTALL_DIR_CMAKE}")

diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index 55028a21e161cdb068188bd981d0486536a5b316..faea1709d058d559aadc8d06851b6aa6c90d910f 100644 (file)
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -603,7 +603,7 @@ endmacro()
 # prior to version 3.3 not supporting per-configuration install paths
 # for install target files (see https://cmake.org/Bug/view.php?id=14317)
 macro (OCCT_UPDATE_TARGET_FILE)
-  if (NOT SINGLE_GENERATOR)
+  if (WIN32)
     OCCT_INSERT_CODE_FOR_TARGET ()
   endif()
 

diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
index 323b5387c866a62ecd765b42fb5c6b5856e12d99..1702611e471ae1df54d9f5b6db44db08ecaba316 100644 (file)
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -142,7 +142,7 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
   endif()
 endforeach()
 
-if (NOT SINGLE_GENERATOR)
+if (WIN32)
   OCCT_INSERT_CODE_FOR_TARGET ()
 endif()
 

diff --git a/adm/cmake/occt_toolkit_tool.cmake b/adm/cmake/occt_toolkit_tool.cmake
index 3d297ee0a29924bd2d0c9dd31eeaa5f1147b2c89..13a8f07cbd84b4bf9bf07ffe220e87906cdb878f 100644 (file)
--- a/adm/cmake/occt_toolkit_tool.cmake
+++ b/adm/cmake/occt_toolkit_tool.cmake
@@ -168,7 +168,7 @@ foreach (OCCT_MODULE ${OCCT_TOOLS})
   endif()
 endforeach()
 
-if (NOT SINGLE_GENERATOR)
+if (WIN32)
   OCCT_INSERT_CODE_FOR_TARGET ()
 endif()