diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2025-04-08 17:52:08 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-05-07 20:36:38 +0000 |
| commit | 51343a5e9902b10465f77f44bbc935045ad12535 (patch) | |
| tree | 91c21c2a86bc56b8eaee7816c825c227a52e5199 | |
| parent | b6f421c3621e1306f6ee86d2c3cd67018307629a (diff) | |
Do pass -isysroot optionally for gn build6.8
With cmake 4.0 changes, we can no longer expect CMAKE_OSX_SYSROOT
to be set:
https://cmake.org/cmake/help/latest/release/4.0.html#other-changes
Therefore make the setting optional for gn, as it should not be
required on "modern macOS".
Task-number: QTBUG-135621
Change-Id: I48ed72d6e920fec4c395eb04c8a18619e045c1b4
Reviewed-by: Moss Heim <moss.heim@qt.io>
(cherry picked from commit 4bf8f28aeeba3f416bc411c396f2be92f5a1c4b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7c01d710dbfc7441077d9c0fecb6acc674715307)
| -rw-r--r-- | src/gn/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt index 9782f17ab..fdf0b11a1 100644 --- a/src/gn/CMakeLists.txt +++ b/src/gn/CMakeLists.txt @@ -70,8 +70,8 @@ add_custom_command( --platform ${platform} --ar ${CMAKE_AR} --qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io" - $<$<PLATFORM_ID:Darwin>:--isysroot> - $<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}> + $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${CMAKE_OSX_SYSROOT}>>:--isysroot> + $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${CMAKE_OSX_SYSROOT}>>:${CMAKE_OSX_SYSROOT}> $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:--osx-architectures> $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:${OSX_ARCH}> COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE} |