diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-02-26 16:11:08 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-05-22 14:10:17 +0200 |
| commit | 6d6037be24bcbff5efada34ed39331c7c8b28f3b (patch) | |
| tree | 40febb3d86fa4742dcc2cebc9da80b1263456ba5 /CMakeLists.txt | |
| parent | 68de090b1fce66f36743d31f384398af8c140a1d (diff) | |
Add mac builds to cmake
We need to pass -F or -iframework to gn as a compiler flag, however
cmake keeps this parameter as include dir and adds internally
"-iframework QtFoo.framework/.." for the compiler call. This internal
handling can not be accessed with the genex. Add the manual conversion.
Task-number: QTBUG-91760
Change-Id: Id12831432ccb0516be52f79bd5f6cfcbe7e87d9c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 876db610e..1a6bbfe9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,10 +163,12 @@ if(NOT Ninja_FOUND) externalproject_add_stepdependencies(gn install ninja) endif() -# install resources (again), coin calls install with DESTDIR -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/translations/qtwebengine_locales - DESTINATION ${CMAKE_INSTALL_PREFIX}/translations -) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/resources - DESTINATION ${CMAKE_INSTALL_PREFIX} -) +if(NOT QT_FEATURE_framework) + # install resources (again), coin calls install with DESTDIR + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/translations/qtwebengine_locales + DESTINATION ${CMAKE_INSTALL_PREFIX}/translations + ) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/resources + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) +endif() |