diff options
| author | LRFLEW <LRFLEW@aol.com> | 2018-10-23 17:49:48 -0600 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-23 16:49:48 -0700 |
| commit | 16e7f4187bd2864705b11e24b29896a2987deaeb (patch) | |
| tree | 1cb87ac6d8b23ec7451319bb170a5a7ff10cc351 /scripts | |
| parent | c99f891b305ae0c3a0c72ad127480ac5851cfbd7 (diff) | |
| download | vcpkg-16e7f4187bd2864705b11e24b29896a2987deaeb.tar.gz vcpkg-16e7f4187bd2864705b11e24b29896a2987deaeb.zip | |
Create macOS configuration variables for triplets (#4477)
* Create macOS configuration variables for triplets
* Add new macOS configuration variables to documentation
* [vcpkg-configure-cmake] Fix typo
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 11 | ||||
| -rw-r--r-- | scripts/toolchains/osx.cmake | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index e89ac660e..617fe1a0f 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -201,6 +201,17 @@ function(vcpkg_configure_cmake) ) endif() + # Sets configuration variables for macOS builds + if(DEFINED VCPKG_INSTALL_NAME_DIR) + list(APPEND _csc_OPTIONS "-DCMAKE_INSTALL_NAME_DIR=${VCPKG_INSTALL_NAME_DIR}") + endif() + if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) + list(APPEND _csc_OPTIONS "-DCMAKE_OSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}") + endif() + if(DEFINED VCPKG_OSX_SYSROOT) + list(APPEND _csc_OPTIONS "-DCMAKE_OSX_SYSROOT=${VCPKG_OSX_SYSROOT}") + endif() + set(rel_command ${CMAKE_COMMAND} ${_csc_SOURCE_PATH} "${_csc_OPTIONS}" "${_csc_OPTIONS_RELEASE}" -G ${GENERATOR} diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake index 9c4fdb12e..296d74ebe 100644 --- a/scripts/toolchains/osx.cmake +++ b/scripts/toolchains/osx.cmake @@ -9,6 +9,8 @@ else() endif()
set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "")
+set(CMAKE_MACOSX_RPATH ON CACHE BOOL "")
+
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(NOT _CMAKE_IN_TRY_COMPILE)
set(CMAKE_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fPIC" CACHE STRING "")
|