summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-09 12:02:40 (GMT)
committerBrad King <brad.king@kitware.com>2015-04-09 12:02:40 (GMT)
commit73dcba5181e6dd7937aa83958a54cabaea8c3576 (patch)
tree3ccb1333a3b682c8c7d72df6afb3b2bf667139bc /CMakeLists.txt
parentf3be6c1b9b3df6f1121e578807f06c29a003c58d (diff)
downloadCMake-73dcba5181e6dd7937aa83958a54cabaea8c3576.zip
CMake-73dcba5181e6dd7937aa83958a54cabaea8c3576.tar.gz
CMake-73dcba5181e6dd7937aa83958a54cabaea8c3576.tar.bz2
Simplify logic to compute install prefix in OS X CMake.app
Also avoid explicitly dereferencing a variable in an if() condition.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
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