summaryrefslogtreecommitdiffstats
path: root/Modules/Qt4Macros.cmake
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2016-10-31 09:25:38 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-01 13:31:08 (GMT)
commit542d52f95e3540953113fc66dc7a7958b9c184de (patch)
treec5061a7a07a40caafc6f26e72bbf1c687f2f573a /Modules/Qt4Macros.cmake
parent876da11858ab6649bb088c4bb7758fc84910ba20 (diff)
downloadCMake-542d52f95e3540953113fc66dc7a7958b9c184de.zip
CMake-542d52f95e3540953113fc66dc7a7958b9c184de.tar.gz
CMake-542d52f95e3540953113fc66dc7a7958b9c184de.tar.bz2
Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"
Revert commit v3.7.0-rc1~48^2 (Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path, 2016-09-25). The replacement of `else()` with `if(CMAKE_OSX_SYSROOT)` defeats the prior handling of `if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")`. This causes the combination -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ to not be honored and `-isysroot` to be emitted as a compiler flag universally. We will need another solution to the problem the now-reverted commit was meant to address. Closes: #16394
Diffstat (limited to 'Modules/Qt4Macros.cmake')
0 files changed, 0 insertions, 0 deletions