From bb959af00a424b1be4ef45a03ed6cf6d51b9a261 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 13 Jun 2019 15:55:38 +0200 Subject: [PATCH] Automatically find apple frameworks when building a repo Instead of doing it just in qtbase/src, we need to do it for all repos before building ./src. Change-Id: I57f226b849cd5370ffbbbea8a694697d400957a4 Reviewed-by: Leander Beernaert Reviewed-by: Liang Qi --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 3 +++ qmake/CMakeLists.txt | 2 -- src/CMakeLists.txt | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index d6b65b5b381..eeba186a705 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -36,6 +36,9 @@ macro(qt_build_repo_begin) # Optionally include a repo specific Setup module. include(${PROJECT_NAME}Setup OPTIONAL) + + # Find Apple frameworks if needed. + qt_find_apple_system_frameworks() endmacro() macro(qt_build_repo_end) diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 408a14dd26b..6f8763524f5 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -8,8 +8,6 @@ qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs" DESTINATION ${mkspecs_install_dir}) # special case end -qt_find_apple_system_frameworks() # special case - ##################################################################### ## qmake Binary: ##################################################################### diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 682f70ebd21..36bdd3d4ca9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,3 @@ -qt_find_apple_system_frameworks() - add_subdirectory(3rdparty) function(find_or_build_bootstrap_names)