[Cmake-commits] CMake branch, next, updated. v2.8.12-4693-gc86980f

[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  c86980ff60530f9ab399a77ff10a8f7f2d7c6bef (commit)
       via  4ac5dd33cf3532a1a0aabbccc970c17c7bda43a5 (commit)
      from  61902843e01fa1b8520a928b1bebfeb7a9f755bf (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=c86980ff60530f9ab399a77ff10a8f7f2d7c6bef
commit c86980ff60530f9ab399a77ff10a8f7f2d7c6bef
Merge: 6190284 4ac5dd3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 31 10:02:36 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 31 10:02:36 2013 -0400

    Merge topic 'add-CMAKE_FIND_NO_INSTALL_PREFIX' into next
    
    4ac5dd3 Fix RunCMake.no_install_prefix test on VS 6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ac5dd33cf3532a1a0aabbccc970c17c7bda43a5
commit 4ac5dd33cf3532a1a0aabbccc970c17c7bda43a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 31 10:00:53 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 31 10:00:53 2013 -0400

    Fix RunCMake.no_install_prefix test on VS 6
    
    Pass the CMAKE_INSTALL_PREFIX cache entry with a type.  The cache
    entry argument parsing compiled by VS 6 seems buggy without the
    type, which will have to be tracked down separately from this topic.

diff --git a/Tests/RunCMake/no_install_prefix/RunCMakeTest.cmake b/Tests/RunCMake/no_install_prefix/RunCMakeTest.cmake
index e7b7e16..2923449 100644
--- a/Tests/RunCMake/no_install_prefix/RunCMakeTest.cmake
+++ b/Tests/RunCMake/no_install_prefix/RunCMakeTest.cmake
@@ -5,7 +5,7 @@ set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix"
 file(REMOVE_RECURSE "${RunCMake_BINARY_DIR}/prefix")
 file(MAKE_DIRECTORY "${RunCMake_BINARY_DIR}/prefix/NoPrefix")
 file(WRITE "${RunCMake_BINARY_DIR}/prefix/NoPrefix/NoPrefixConfig.cmake" "")
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix")
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/prefix")
 run_cmake(with_install_prefix)
 
 file(REMOVE_RECURSE "${RunCMake_BINARY_DIR}/prefix")

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

Summary of changes:
 .../RunCMake/no_install_prefix/RunCMakeTest.cmake  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake