Modify installation procedure using OCCT_INSTALL_BIN_LETTER (bind/bini/lib/libi in...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8ee36b09a40aa662f99d9871e371448fa742de4..8c5bb7238389d1b04921039052d7137b6b6b7abe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -969,10 +969,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 1381625eb1e822413cb212996c4c6625dc1ea42b..131ee973e44c054c89316ec081072ffcce867e0e 100644 (file)
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -550,7 +550,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 b2d62050db75b3a608ae354fe555fc015b63e183..084bc0510557f91952c4bc343be8ba74f0c5bc64 100644 (file)
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -139,7 +139,7 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
   endif()
 endforeach()
 
-if (NOT SINGLE_GENERATOR)
+if (WIN32)
   OCCT_INSERT_CODE_FOR_TARGET ()
 endif()
 
@@ -152,8 +152,8 @@ else()
   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
 
   if (MSVC)
-    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
-             CONFIGURATIONS Debug
+    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+             CONFIGURATIONS Debug RelWithDebInfo
              DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
   endif()