46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d051f5ccce..91517a5936 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -317,7 +317,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
|
|
|
|
set (BIN_LETTER "")
|
|
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
|
- set (BIN_LETTER "d")
|
|
elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
|
|
set (BIN_LETTER "i")
|
|
endif()
|
|
@@ -1002,6 +1001,7 @@ if (WIN32)
|
|
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
|
|
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
|
|
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
|
|
+ set (CMAKE_PDB_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
|
|
endif()
|
|
|
|
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
|
diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
|
|
index 92a8db33dc..3d4c95b584 100644
|
|
--- a/adm/cmake/occt_macros.cmake
|
|
+++ b/adm/cmake/occt_macros.cmake
|
|
@@ -779,7 +779,7 @@ macro (OCCT_INSERT_CODE_FOR_TARGET)
|
|
elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
|
|
set (OCCT_INSTALL_BIN_LETTER \"i\")
|
|
elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
|
|
- set (OCCT_INSTALL_BIN_LETTER \"d\")
|
|
+ set (OCCT_INSTALL_BIN_LETTER \"\")
|
|
endif()")
|
|
endmacro()
|
|
|
|
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
|
index beb934f7..95cec74a 100644
|
|
--- a/tools/CMakeLists.txt
|
|
+++ b/tools/CMakeLists.txt
|
|
@@ -172,7 +172,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
|
|
|
|
set (BIN_LETTER "")
|
|
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
|
- set (BIN_LETTER "d")
|
|
elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
|
|
set (BIN_LETTER "i")
|
|
endif()
|