WL#16310: Fix install location of debug components on Windows

Author: rsomla1

CMakeLists.txt

@@ -545,9 +545,9 @@ install(TARGETS connector
 
 install(TARGETS connector
   CONFIGURATIONS Debug
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT XDevAPIDev
-  RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC_DEBUG}" COMPONENT XDevAPIDev
+  RUNTIME DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT XDevAPIDll
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT XDevAPIDll
 )
 
 if(MSVC AND NOT BUILD_STATIC)
@@ -560,7 +560,7 @@ if(MSVC AND NOT BUILD_STATIC)
 
   install(FILES $<TARGET_PDB_FILE:connector>
     CONFIGURATIONS Debug
-    DESTINATION "${INSTALL_LIB_DIR}/debug"
+    DESTINATION "${INSTALL_LIB_DIR_DEBUG}"
     COMPONENT Debuginfo
   )
 

install_layout.cmake

@@ -111,13 +111,24 @@ if(NOT INSTALL_LIB_DIR)
   set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
 endif()
 
+if(NOT INSTALL_LIB_DIR_DEBUG)
+  set(INSTALL_LIB_DIR_DEBUG "${INSTALL_LIB_DIR}/debug")
+endif()
+
 if(NOT INSTALL_LIB_DIR_STATIC)
   set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR}")
   if(VS)
     set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR_STATIC}/${VS}")
   endif()
 endif()
 
+if(NOT INSTALL_LIB_DIR_STATIC_DEBUG)
+  set(INSTALL_LIB_DIR_STATIC_DEBUG "${INSTALL_LIB_DIR_DEBUG}")
+  if(VS)
+    set(INSTALL_LIB_DIR_STATIC_DEBUG "${INSTALL_LIB_DIR_STATIC_DEBUG}/${VS}")
+  endif()
+endif()
+
 if(NOT INSTALL_INCLUDE_DIR)
   set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
 endif()
@@ -141,8 +152,19 @@ set(INSTALL_LIB_DIR "${INSTALL_LIB_DIR}"
   CACHE INTERNAL "Library install location (relative to install root)"
 )
 
+set(INSTALL_LIB_DIR_DEBUG "${INSTALL_LIB_DIR_DEBUG}"
+  CACHE INTERNAL
+  "Library install location for debug builds (relative to install root)"
+)
+
 set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR_STATIC}"
-  CACHE INTERNAL "Install location for static libraries (relative to install root)"
+  CACHE INTERNAL
+  "Install location for static libraries (relative to install root)"
+)
+
+set(INSTALL_LIB_DIR_STATIC_DEBUG "${INSTALL_LIB_DIR_STATIC_DEBUG}"
+  CACHE INTERNAL
+  "Install location for static libraries for debug builds (relative to install root)"
 )
 
 #

jdbc/CMakeLists.txt

@@ -336,9 +336,9 @@ install(TARGETS connector-jdbc
 
 install(TARGETS connector-jdbc
   CONFIGURATIONS Debug
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT JDBCDev
-  RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT JDBCDll
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT JDBCDll
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC_DEBUG}" COMPONENT JDBCDev
+  RUNTIME DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT JDBCDll
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT JDBCDll
 )
 
 
@@ -352,7 +352,7 @@ if(MSVC AND NOT BUILD_STATIC)
 
   install(FILES $<TARGET_PDB_FILE:connector-jdbc>
     CONFIGURATIONS Debug
-    DESTINATION "${INSTALL_LIB_DIR}/debug"
+    DESTINATION "${INSTALL_LIB_DIR_DEBUG}"
     COMPONENT Debuginfo
   )
 

mysql-concpp-config.cmake.in

@@ -530,7 +530,7 @@ function(add_connector_target which tgt base_name)
   unset(lib_path_debug CACHE)
   find_library(lib_path_debug
     NAMES ${base_name}
-    PATHS ${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/${vs_suffix}/debug
+    PATHS ${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/debug/${vs_suffix}
     NO_DEFAULT_PATH
     NO_CACHE
   )
@@ -557,7 +557,7 @@ function(add_connector_target which tgt base_name)
   if(WIN32)
 
     set(lib_path_debug
-      "${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/${vs_suffix}/debug/${base_name}.lib"
+      "${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/debug/${vs_suffix}/${base_name}.lib"
     )
 
   endif()