From: apn <apn@opencascade.com>
Date: Wed, 29 Nov 2017 12:46:54 +0000 (+0300)
Subject: 0029266: CMake install does not copy pdb files in Debug mode due to the changes in... 
X-Git-Tag: V7_3_0_beta~55
X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=b1f350a2e1168f42487de0549ac425da67c1c407

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

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 4987c1a77e..2dbe95ff2c 100644
--- 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 55028a21e1..faea1709d0 100644
--- 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 323b5387c8..1702611e47 100644
--- 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 3d297ee0a2..13a8f07cbd 100644
--- 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()