Updated pdb file locations.

Now supporting generators NMake and Visual Studio.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 411bdef..0907cc1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,6 +287,15 @@ if(WIN32)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN")
 
+       set(CMAKE_USE_RELATIVE_PATH ON)
+       if (${CMAKE_GENERATOR} MATCHES "NMake Makefile*")
+               set(CMAKE_PDB_BINARY_DIR ${CMAKE_BINARY_DIR})
+       elseif (${CMAKE_GENERATOR} MATCHES "Visual Studio*")
+               set(CMAKE_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+       else()
+               message(FATAL "Unknown generator ${CMAKE_GENERATOR}")
+       endif()
+
        # Set product and vendor for dll and exe version information.
        set(RC_VERSION_VENDOR ${VENDOR})
        set(RC_VERSION_PRODUCT ${PRODUCT})

diff --git a/channels/rdpsnd/client/winmm/CMakeLists.txt b/channels/rdpsnd/client/winmm/CMakeLists.txt
index 45a4f33..e1515b9 100644 (file)
--- a/channels/rdpsnd/client/winmm/CMakeLists.txt
+++ b/channels/rdpsnd/client/winmm/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_ADDIN_PATH} EXPORT FreeRDPTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND NOT STATIC_CHANNELS AND BUILD_SHARED_LIBS)
-       install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
+       install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${FREERDP_ADDIN_PATH} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client/WinMM")

diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index e4a5fa3..d2d513f 100644 (file)
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -81,13 +81,13 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 if(WITH_CLIENT_INTERFACE)
        install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
        if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-               install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+               install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
        endif()
        add_subdirectory(cli)
 else()
        install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
        if (WITH_DEBUG_SYMBOLS AND MSVC)
-               install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+               install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
        endif()
 endif()
 

diff --git a/client/Windows/cli/CMakeLists.txt b/client/Windows/cli/CMakeLists.txt
index 2dd0de7..0272611 100644 (file)
--- a/client/Windows/cli/CMakeLists.txt
+++ b/client/Windows/cli/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
 if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Windows")

diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index 101d6e1..747b2f2 100644 (file)
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -70,10 +70,10 @@ endif()
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
        ${FREERDP_CHANNELS_CLIENT_LIBS})
-       
+
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
        ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
-       
+
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
 
 if(OPENBSD)
@@ -85,7 +85,7 @@ endif()
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
 
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-       install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+       install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common")

diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index 00f7517..675d6b6 100644 (file)
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -242,7 +242,7 @@ if(WITH_SSE2)
        endif()
 elseif(WITH_NEON)
        if(CMAKE_COMPILER_IS_GNUCC)
-           set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon")
+               set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon")
        endif()
        # TODO: Add MSVC equivalent
 endif()
@@ -302,14 +302,14 @@ add_definitions(${LIBFREERDP_DEFINITIONS})
 set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
 
 if (WITH_LIBRARY_VERSIONING)
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+    set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
 endif()
 
 
 target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr)
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp")

diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt
index 7b25565..e12f162 100644 (file)
--- a/rdtk/librdtk/CMakeLists.txt
+++ b/rdtk/librdtk/CMakeLists.txt
@@ -66,7 +66,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT RdTkTargets)
 if (MSVC AND BUILD_SHARED_LIBS)
-       install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+       install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk")

diff --git a/server/Sample/CMakeLists.txt b/server/Sample/CMakeLists.txt
index 9e92437..451f3e9 100644 (file)
--- a/server/Sample/CMakeLists.txt
+++ b/server/Sample/CMakeLists.txt
@@ -52,7 +52,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT server)
 if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/Sample")

diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
index 373caa9..1f01d00 100644 (file)
--- a/server/common/CMakeLists.txt
+++ b/server/common/CMakeLists.txt
@@ -64,7 +64,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/Common")

diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 711dbb5..65f9af0 100644 (file)
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -18,7 +18,7 @@
 if (APPLE)
        # flat_namespace should be avoided, but is required for -undefined warning. Since WinPR currently has
        # a lot of undefined symbols in use, use this hack until they're filled out.
-       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace,-undefined,warning")    
+       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace,-undefined,warning")
 endif()
 
 set(WINPR_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -44,15 +44,15 @@ endmacro()
 macro (winpr_include_directory_add)
     file (RELATIVE_PATH _relPath "${WINPR_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
     foreach (_inc ${ARGN})
-                               if (IS_ABSOLUTE ${_inc})
-                                                       list (APPEND WINPR_INCLUDES "${_inc}")
-                               else()
-                                       if (_relPath)
-                                                       list (APPEND WINPR_INCLUDES "${_relPath}/${_inc}")
-                                       else()
-                                                       list (APPEND WINPR_INCLUDES "${_inc}")
-                                       endif()
-                               endif()
+                if (IS_ABSOLUTE ${_inc})
+                            list (APPEND WINPR_INCLUDES "${_inc}")
+                else()
+                    if (_relPath)
+                            list (APPEND WINPR_INCLUDES "${_relPath}/${_inc}")
+                    else()
+                            list (APPEND WINPR_INCLUDES "${_inc}")
+                    endif()
+                endif()
     endforeach()
     if (_relPath)
         set (WINPR_INCLUDES ${WINPR_INCLUDES} PARENT_SCOPE)
@@ -74,15 +74,15 @@ macro (winpr_definition_add)
 endmacro()
 
 # Level "1" API as defined for MinCore.lib
-set(WINPR_CORE synch locale library file comm pipe interlocked security 
+set(WINPR_CORE synch locale library file comm pipe interlocked security
        environment crypto registry credentials path io memory input shell
-       heap utils error com timezone sysinfo pool handle thread) 
+       heap utils error com timezone sysinfo pool handle thread)
 
 foreach(DIR ${WINPR_CORE})
        add_subdirectory(${DIR})
 endforeach()
 
-set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui 
+set(WINPR_LEVEL2 winsock sspi winhttp asn1 sspicli crt bcrypt rpc credui
        wtsapi dsparse wnd smartcard nt clipboard)
 
 foreach(DIR ${WINPR_LEVEL2})
@@ -114,13 +114,13 @@ endif()
 add_library(${MODULE_NAME} ${WINPR_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
 if (WITH_LIBRARY_VERSIONING)
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION})
+    set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION})
 endif()
 
 add_definitions(${WINPR_DEFINITIONS})
 target_link_libraries(${MODULE_NAME} ${WINPR_LIBS})
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
 endif()
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr")

diff --git a/winpr/tools/makecert/cli/CMakeLists.txt b/winpr/tools/makecert/cli/CMakeLists.txt
index 6a08a1b..f175e72 100644 (file)
--- a/winpr/tools/makecert/cli/CMakeLists.txt
+++ b/winpr/tools/makecert/cli/CMakeLists.txt
@@ -49,6 +49,6 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets)
 if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()