Merge topic 'cpack-osx-sysroot'
63e2af0f
CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
This commit is contained in:
commit
5cdba31fc6
|
@ -586,7 +586,7 @@ _cpack_set_default(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
|
||||||
|
|
||||||
# set sysroot so SDK tools can be used
|
# set sysroot so SDK tools can be used
|
||||||
if(CMAKE_OSX_SYSROOT)
|
if(CMAKE_OSX_SYSROOT)
|
||||||
_cpack_set_default(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
|
_cpack_set_default(CPACK_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_PATH}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(DEFINED CPACK_COMPONENTS_ALL)
|
if(DEFINED CPACK_COMPONENTS_ALL)
|
||||||
|
|
Loading…
Reference in New Issue