[Cmake-commits] CMake branch, next, updated. v2.8.6-1824-g8b14b36

[David Cole]

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  8b14b365c5a7a71f461515093b8f8a4f1e55697c (commit)
       via  537020f9581d36c436d18e30f98d58f0ef5924cc (commit)
      from  0e3d4caa98eed443424a0f32b5d9f49abc94527c (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=8b14b365c5a7a71f461515093b8f8a4f1e55697c
commit 8b14b365c5a7a71f461515093b8f8a4f1e55697c
Merge: 0e3d4ca 537020f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Nov 9 13:57:50 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 9 13:57:50 2011 -0500

    Merge topic 'fix-11213-vs10-mfc-support' into next
    
    537020f Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=537020f9581d36c436d18e30f98d58f0ef5924cc
commit 537020f9581d36c436d18e30f98d58f0ef5924cc
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Nov 9 13:31:05 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Nov 9 13:35:28 2011 -0500

    Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)
    
    InstallRequiredSystemLibraries does not install any dlls when
    used with VS 6 dashboards. Modify the ValidateBuild script to
    expect only 1 file when building with VS 6.
    
    Using "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" does not work when
    <INSTALL_DIR> evaluates to a long enough string. However, using
    "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>" does work, even with
    the longer strings. So: make sure to include the ":PATH" when using
    this construct with ExternalProject calls so that they may install
    to the proper location on VS 6 builds. All existing calls that match
    "CMAKE_INSTALL_PREFIX.*INSTALL_DIR" include the ":PATH" after this
    commit.
    
    By the way: https://twitter.com/DLRdave/status/134339505397309440

diff --git a/Tests/ExternalProject/Example/CMakeLists.txt b/Tests/ExternalProject/Example/CMakeLists.txt
index 2cadd7d..69ebaaf 100644
--- a/Tests/ExternalProject/Example/CMakeLists.txt
+++ b/Tests/ExternalProject/Example/CMakeLists.txt
@@ -6,6 +6,6 @@ include(ExternalProject)
 ExternalProject_Add(
   cmake281
   URL http://www.cmake.org/files/v2.8/cmake-2.8.1.tar.gz
-  CMAKE_ARGS -D CMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   BUILD_COMMAND ""
 )
diff --git a/Tests/MFC/CMakeLists.txt b/Tests/MFC/CMakeLists.txt
index df3149a..62ff749 100644
--- a/Tests/MFC/CMakeLists.txt
+++ b/Tests/MFC/CMakeLists.txt
@@ -17,7 +17,7 @@ ExternalProject_Add(mfcShared
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy
     ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.SharedMfcDll.txt
     <SOURCE_DIR>/CMakeLists.txt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   )
 
 
@@ -33,7 +33,7 @@ ExternalProject_Add(mfcStatic
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy
     ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.StaticMfcLib.txt
     <SOURCE_DIR>/CMakeLists.txt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   )
 
 
diff --git a/Tests/MFC/ValidateBuild.cmake.in b/Tests/MFC/ValidateBuild.cmake.in
index 68de549..ed923f5 100644
--- a/Tests/MFC/ValidateBuild.cmake.in
+++ b/Tests/MFC/ValidateBuild.cmake.in
@@ -31,9 +31,17 @@ message(STATUS "===== mfcShared install tree =====")
 file(GLOB_RECURSE files "${binary_dir}/mfcShared-prefix/bin/*.*")
 message(STATUS "mfcShared files='${files}'")
 list(LENGTH files len)
-if(len LESS 3)
+
+set(msvc6 "@MSVC60@")
+if("${msvc6}" STREQUAL "1")
+  set(expected_minimum_file_count 1)
+else()
+  set(expected_minimum_file_count 3)
+endif()
+
+if(len LESS ${expected_minimum_file_count})
   message(FATAL_ERROR
-    "len='${len}' is less than '3' (count of shared 'bin' files)")
+    "len='${len}' is less than '${expected_minimum_file_count}' (count of shared 'bin' files)")
 endif()
 foreach(f ${files})
   message(STATUS "file '${f}'")

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

Summary of changes:
 Tests/ExternalProject/Example/CMakeLists.txt |    2 +-
 Tests/MFC/CMakeLists.txt                     |    4 ++--
 Tests/MFC/ValidateBuild.cmake.in             |   12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake