1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatically find apple frameworks when building a repo

Browse Source 
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 <leander.beernaert@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Alexandru Croitor 2019-06-13 15:55:38 +02:00
parent 2e30f1d9b6
commit bb959af00a
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -36,6 +36,9 @@ macro(qt_build_repo_begin)
# Optionally include a repo specific Setup module. # Optionally include a repo specific Setup module.
include(${PROJECT_NAME}Setup OPTIONAL) include(${PROJECT_NAME}Setup OPTIONAL)
# Find Apple frameworks if needed.
qt_find_apple_system_frameworks()
endmacro() endmacro()
macro(qt_build_repo_end) macro(qt_build_repo_end)

2
qmake/CMakeLists.txt
View File

@ -8,8 +8,6 @@ qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs"
DESTINATION ${mkspecs_install_dir}) DESTINATION ${mkspecs_install_dir})
# special case end # special case end
qt_find_apple_system_frameworks() # special case
##################################################################### #####################################################################
## qmake Binary: ## qmake Binary:
##################################################################### #####################################################################

2
src/CMakeLists.txt
View File

@ -1,5 +1,3 @@
qt_find_apple_system_frameworks()
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
function(find_or_build_bootstrap_names) function(find_or_build_bootstrap_names)