diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-10 12:30:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-10 12:30:59 (GMT) |
| commit | 4411d1d779345f54c132209834daa49763cd1999 (patch) | |
| tree | 7ac74e6a9a4e6edbb06377bc8f0478c3360cff07 | |
| parent | a74d558d1082f2bd380d7a03772972af2cd43e56 (diff) | |
| parent | 73dcba5181e6dd7937aa83958a54cabaea8c3576 (diff) | |
| download | CMake-4411d1d779345f54c132209834daa49763cd1999.zip CMake-4411d1d779345f54c132209834daa49763cd1999.tar.gz CMake-4411d1d779345f54c132209834daa49763cd1999.tar.bz2 | |
Merge topic 'simplify-osx-install-prefix'
73dcba51 Simplify logic to compute install prefix in OS X CMake.app
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d86ae96..e979d4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -543,10 +543,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") # make sure CMAKE_INSTALL_PREFIX ends in / - string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN) - math(EXPR LEN "${LEN} -1" ) - string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH) - if(NOT "${ENDCH}" STREQUAL "/") + if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$") set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") endif() set(CMAKE_INSTALL_PREFIX |