[Cmake-commits] CMake branch, next, updated. v3.2.1-1663-g78b6e5f

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  78b6e5f85d2e10bdd6b2dab8dea4393c8b7b06f4 (commit)
       via  73dcba5181e6dd7937aa83958a54cabaea8c3576 (commit)
      from  0d1ae09d6d166a285b42611ebe348b6c32a3ed21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78b6e5f85d2e10bdd6b2dab8dea4393c8b7b06f4
commit 78b6e5f85d2e10bdd6b2dab8dea4393c8b7b06f4
Merge: 0d1ae09 73dcba5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 9 08:04:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 9 08:04:23 2015 -0400

    Merge topic 'simplify-osx-install-prefix' into next
    
    73dcba51 Simplify logic to compute install prefix in OS X CMake.app


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73dcba5181e6dd7937aa83958a54cabaea8c3576
commit 73dcba5181e6dd7937aa83958a54cabaea8c3576
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 9 08:02:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 9 08:02:40 2015 -0400

    Simplify logic to compute install prefix in OS X CMake.app
    
    Also avoid explicitly dereferencing a variable in an if() condition.

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

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
CMake