whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/util
History
Joerg Bornemann f19668ce65 Don't use libs in /usr/local for configure tests by default on macOS 
Since commit f3c7d22dd0 we do not use
libraries from /usr/local and other non-system locations on macOS.  But
our configure tests still did.  This led to discrepancies between
find_package calls in configure tests and the Qt project itself.

Mentioned commit removed /usr/local and friends from
CMAKE_SYSTEM_PREFIX_PATH.  But we can't pass this variable to the
configure tests, because CMake sets it up and overwrites our value.

Pass CMAKE_SYSTEM_PREFIX_PATH and CMAKE_SYSTEM_FRAMEWORK_PATH as
QT_CONFIGURE_TEST_CMAKE_SYSTEM_{PREFIX|FRAMEWORK}_PATH variables to
tests.

Tests with separate project files that call find_package() must add code
like this after the project() command:

if(DEFINED QT_CONFIGURE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
    set(CMAKE_SYSTEM_PREFIX_PATH
        "${QT_CONFIGURE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
endif()
if(DEFINED QT_CONFIGURE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
    set(CMAKE_SYSTEM_FRAMEWORK_PATH
        "${QT_CONFIGURE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
endif()

Adjust pro2cmake accordingly.

Task-number: QTBUG-97076
Change-Id: Iac1622768d1200e6ea63be569eef12b7eada6c76
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 		2021-10-08 23:15:31 +02:00
..
accessibilityinspector Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
aglfn
…
android Change Android emulator command path 2021-06-14 16:01:52 +03:00
cmake Don't use libs in /usr/local for configure tests by default on macOS 2021-10-08 23:15:31 +02:00
edid Edid vendor table generator (2/N): use idiomatic C++ 2021-04-21 15:28:54 +02:00
glgen Remove the openglextensions module 2020-06-10 09:35:04 +02:00
gradientgen Replace Qt CONSTEXPR defines with constexpr 2020-08-14 15:52:58 +02:00
includemocs
…
integrity
…
lexgen Replace QtTest headers with QTest 2020-12-22 15:20:30 +01:00
locale_database Remove trailing zero rows from qtimezoneprivate_data_p.h's tables 2021-09-10 19:33:06 +02:00
plugintest
…
publicSuffix Eliminate the need to preprocess the public suffix list 2021-01-25 18:03:00 +01:00
qfloat16-tables Round float->qfloat16 to even 2020-09-06 12:35:12 +02:00
unicode Unicode: Add script to facilitate UCD update 2021-10-05 20:38:02 +02:00
x86simdgen Move qsimd* from corelib/tools to corelib/global 2020-03-26 09:15:32 +01:00
xkbdatagen Add the "Territory" enumerated type for QLocale 2021-04-15 20:17:49 +08:00