Xcode compatibility update: pcre, mysql-test-run.pl

cmake/pcre.cmake

@@ -11,9 +11,7 @@ MACRO(BUNDLE_PCRE2)
   FOREACH(lib pcre2-posix pcre2-8)
     ADD_LIBRARY(${lib} STATIC IMPORTED GLOBAL)
     ADD_DEPENDENCIES(${lib} pcre2)
-    IF(WIN32)
-      # Debug libary name.
-      # Same condition as in pcre2 CMakeLists.txt that adds "d"
+
     GET_PROPERTY(MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
     IF(MULTICONFIG)
       SET(intdir "${CMAKE_CFG_INTDIR}/")
@@ -22,10 +20,13 @@ MACRO(BUNDLE_PCRE2)
     ENDIF()
 
     SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+    IF(WIN32)
+      # Debug libary name.
+      # Same condition as in pcre2 CMakeLists.txt that adds "d"
       SET(file_d ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}d${CMAKE_STATIC_LIBRARY_SUFFIX})
       SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d})
     ELSE()
-      SET(file ${dir}/src/pcre2-build/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
       SET(file_d)
     ENDIF()
     SET(byproducts ${byproducts} BUILD_BYPRODUCTS ${file} ${file_d})

mysql-test/mysql-test-run.pl

@@ -1260,6 +1260,7 @@ sub command_line_setup {
   {
     $path_client_bindir= mtr_path_exists("$bindir/client_release",
 					 "$bindir/client_debug",
+					 "$bindir/client/debug",
 					 "$bindir/client$opt_vs_config",
 					 "$bindir/client",
 					 "$bindir/bin");