Z991239-527 #comment cmake: 纠正pdb的获取路径

CMakeLists.txt

@@ -88,6 +88,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+if(WIN32)
+	set(RVC_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/bin/${CMAKE_CONFIGURATION_TYPES}")
+else()
+	set(RVC_PDB_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
+endif(WIN32)
+message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
+
 
 if(NOT DEFINED BUILD_SHARED_LIBS)
 	set(BUILD_SHARED_LIBS ON)
@@ -172,7 +179,6 @@ elseif(${CMAKE_GENERATOR} MATCHES "Unix*")
 		message(STATUS ${CMAKE_GENERATOR_PLATFORM})
 	endif()
 endif()
-string(TOLOWER ${BUILD_TYPE_NAME} BUILD_TYPE_NAME_lower)
 # 注释掉之后，目测在Linux之下是跑 x64 位，否则会出现 pthread 找不到的情况，应该是没安装对应的版本
 #if(${CMAKE_GENERATOR} MATCHES "Unix*")
 #	message(STATUS "set 32bits and debug")

RVCComm/CMakeLists.txt

@@ -57,5 +57,5 @@ install(TARGETS ${MODULE_NAME}
 	COMPONENT libraries)
 
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()

libtoolkit/CMakeLists.txt

@@ -117,7 +117,7 @@ install(TARGETS ${MODULE_NAME}
     COMPONENT libraries)
 
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()
 
 if(INSTALL_DEVELOP_FILES)

module/CMakeLists.txt

@@ -70,7 +70,7 @@ macro(deploy_module _module_prefix _module_name)
     COMPONENT modules)
 
     if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-        install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${_module_name}.pdb 
+        install(FILES ${RVC_PDB_BINARY_DIR}/${_module_name}.pdb 
         DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
     endif()
 

spbase/CMakeLists.txt

@@ -96,5 +96,5 @@ install(TARGETS ${MODULE_NAME}
     COMPONENT libraries)
 
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()

sphost/CMakeLists.txt

@@ -49,5 +49,5 @@ install(TARGETS ${MODULE_NAME}
 	COMPONENT libraries)
 
 if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()

spshell/CMakeLists.txt

@@ -66,5 +66,5 @@ install(TARGETS ${MODULE_NAME}
 	COMPONENT libraries)
 
 if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()

test/module/CMakeLists.txt

@@ -70,7 +70,7 @@ macro(deploy_module _module_prefix _module_name)
     COMPONENT modules)
 
     if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-        install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${_module_name}.pdb 
+        install(FILES ${RVC_PDB_BINARY_DIR}/${_module_name}.pdb 
         DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
     endif()
 

winpr/libwinpr/CMakeLists.txt

@@ -153,6 +153,6 @@ install(TARGETS ${MODULE_NAME}
 
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
 endif()
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr")