From bd1573b0f332d4c7c08aab2974aadd544dbc24e3 Mon Sep 17 00:00:00 2001
From: Sergei Krivonos <sergeikrivonos@gmail.com>
Date: Wed, 6 Oct 2021 11:31:08 +0300
Subject: [PATCH] Xcode compatibility update: pcre, mysql-test-run.pl

---
 cmake/pcre.cmake             | 19 ++++++++++---------
 mysql-test/mysql-test-run.pl |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake
index 3d4f163fab9..5ea81f53828 100644
--- a/cmake/pcre.cmake
+++ b/cmake/pcre.cmake
@@ -11,21 +11,22 @@ MACRO(BUNDLE_PCRE2)
   FOREACH(lib pcre2-posix pcre2-8)
     ADD_LIBRARY(${lib} STATIC IMPORTED GLOBAL)
     ADD_DEPENDENCIES(${lib} pcre2)
+
+    GET_PROPERTY(MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    IF(MULTICONFIG)
+      SET(intdir "${CMAKE_CFG_INTDIR}/")
+    ELSE()
+      SET(intdir)
+    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"
-      GET_PROPERTY(MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-      IF(MULTICONFIG)
-        SET(intdir "${CMAKE_CFG_INTDIR}/")
-      ELSE()
-        SET(intdir)
-      ENDIF()
-
-      SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
       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})
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index dbe5fc4d650..9a66a839de9 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/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");