Adjust configure tests to ignore libs in /usr/local on macOS

On macOS, if pkg-config is not used, we modify
CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH to avoid
picking up libs from homebrew or macports.  This must be done in the
configure tests too.  Otherwise the find_package commands may return
different things for configure tests and the Qt build itself.

Task-number: QTBUG-97076
Change-Id: If4a984007bcb588f5be27a83760ce601efd2510d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

12 files changed, 84 insertions, 0 deletions

diff --git a/config.tests/alsa/CMakeLists.txt b/config.tests/alsa/CMakeLists.txt
index 4d98ed67c..08d643fca 100644
--- a/config.tests/alsa/CMakeLists.txt
+++ b/config.tests/alsa/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_alsa LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/avfoundation/CMakeLists.txt b/config.tests/avfoundation/CMakeLists.txt
index 767f29623..64a88ab4d 100644
--- a/config.tests/avfoundation/CMakeLists.txt
+++ b/config.tests/avfoundation/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_avfoundation LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/evr/CMakeLists.txt b/config.tests/evr/CMakeLists.txt
index f07d25254..a8dfd25da 100644
--- a/config.tests/evr/CMakeLists.txt
+++ b/config.tests/evr/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_evr LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/gpu_vivante/CMakeLists.txt b/config.tests/gpu_vivante/CMakeLists.txt
index b31ff9f3a..08560ae7f 100644
--- a/config.tests/gpu_vivante/CMakeLists.txt
+++ b/config.tests/gpu_vivante/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_gpu_vivante LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/gstreamer/CMakeLists.txt b/config.tests/gstreamer/CMakeLists.txt
index 5df5d1022..8bfda9847 100644
--- a/config.tests/gstreamer/CMakeLists.txt
+++ b/config.tests/gstreamer/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_gstreamer LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/gstreamer_appsrc/CMakeLists.txt b/config.tests/gstreamer_appsrc/CMakeLists.txt
index c9ca50489..da5730ef2 100644
--- a/config.tests/gstreamer_appsrc/CMakeLists.txt
+++ b/config.tests/gstreamer_appsrc/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_gstreamer_appsrc LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/gstreamer_photography/CMakeLists.txt b/config.tests/gstreamer_photography/CMakeLists.txt
index 4711553ed..3d34e06cd 100644
--- a/config.tests/gstreamer_photography/CMakeLists.txt
+++ b/config.tests/gstreamer_photography/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_gstreamer_photography LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/linux_v4l/CMakeLists.txt b/config.tests/linux_v4l/CMakeLists.txt
index 5f62e2bee..b5c098a13 100644
--- a/config.tests/linux_v4l/CMakeLists.txt
+++ b/config.tests/linux_v4l/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_linux_v4l LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/mmrenderer/CMakeLists.txt b/config.tests/mmrenderer/CMakeLists.txt
index 252dd3353..1ecc587b0 100644
--- a/config.tests/mmrenderer/CMakeLists.txt
+++ b/config.tests/mmrenderer/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_mmrenderer LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/pulseaudio/CMakeLists.txt b/config.tests/pulseaudio/CMakeLists.txt
index b587034f9..0f29ac8b9 100644
--- a/config.tests/pulseaudio/CMakeLists.txt
+++ b/config.tests/pulseaudio/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_pulseaudio LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/wmf/CMakeLists.txt b/config.tests/wmf/CMakeLists.txt
index f86df13d5..6a903cf8f 100644
--- a/config.tests/wmf/CMakeLists.txt
+++ b/config.tests/wmf/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_wmf LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()
diff --git a/config.tests/wmsdk/CMakeLists.txt b/config.tests/wmsdk/CMakeLists.txt
index 945c25736..d0bc6c616 100644
--- a/config.tests/wmsdk/CMakeLists.txt
+++ b/config.tests/wmsdk/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required(VERSION 3.16)
 project(config_test_wmsdk LANGUAGES C CXX)
 
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
+    set(CMAKE_SYSTEM_PREFIX_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
+endif()
+if(DEFINED QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
+    set(CMAKE_SYSTEM_FRAMEWORK_PATH "${QT_CONFIG_COMPILE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
+endif()
+
 foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
     find_package(${p})
 endforeach()