diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-30 11:34:47 (GMT) |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-30 11:40:31 (GMT) |
| commit | 94c5fa5f7a189c1a99891bbacc6a3b291f399d7a (patch) | |
| tree | 813ec1d093840d88cde296c7fecb0b84876b7000 | |
| parent | 101135069425a1f3af85aa7d1fedf2656d9674f0 (diff) | |
| download | CMake-94c5fa5f7a189c1a99891bbacc6a3b291f399d7a.zip CMake-94c5fa5f7a189c1a99891bbacc6a3b291f399d7a.tar.gz CMake-94c5fa5f7a189c1a99891bbacc6a3b291f399d7a.tar.bz2 | |
iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values
Currently the value is hardcoded to contain only the sysroot for
the respective darwin platform. This means that it can not be changed
in a custom toolchain file.
Instead of overriding the value, simply append it. This is similar
to how it is done in the Google provided Android toolchain file.
The usecase is to allow specifying addiitonal roots to look for
3rd party packages which are definitely not present in the default
sysroot.
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 9301ec9..ab650ef 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -5,7 +5,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "tvOS" OR CMAK set(CMAKE_MACOSX_BUNDLE ON) endif() - set(CMAKE_FIND_ROOT_PATH "${_CMAKE_OSX_SYSROOT_PATH}") + list(APPEND CMAKE_FIND_ROOT_PATH "${_CMAKE_OSX_SYSROOT_PATH}") set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) endif() |