[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6786-g1b68d1c

[Nils Gladitz]

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  1b68d1cdbf864f4c7366080878c93484f50c89dd (commit)
       via  2950cc5ea1f89a80719c5f3b1b6423a137715210 (commit)
      from  262e9134dded1ea93140c01fb6ec5ada16740693 (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=1b68d1cdbf864f4c7366080878c93484f50c89dd
commit 1b68d1cdbf864f4c7366080878c93484f50c89dd
Merge: 262e913 2950cc5
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jan 7 02:48:21 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 7 02:48:21 2014 -0500

    Merge topic 'optional-install' into next
    
    2950cc5 OptionalInstall: try to fix multi configuration dashboard failure


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2950cc5ea1f89a80719c5f3b1b6423a137715210
commit 2950cc5ea1f89a80719c5f3b1b6423a137715210
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jan 7 08:46:23 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Jan 7 08:46:23 2014 +0100

    OptionalInstall: try to fix multi configuration dashboard failure

diff --git a/Tests/MissingInstall/CMakeLists.txt b/Tests/MissingInstall/CMakeLists.txt
index 98fbc61..91624f7 100644
--- a/Tests/MissingInstall/CMakeLists.txt
+++ b/Tests/MissingInstall/CMakeLists.txt
@@ -9,9 +9,9 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
 set(CMAKE_SKIP_PACKAGE_ALL_DEPENDENCY 1)
 
 if(CMAKE_CONFIGURATION_TYPES)
-  set(SI_CONFIG --config $<CONFIGURATION>)
+  set(MULTI_CONFIG ON)
 else()
-  set(SI_CONFIG)
+  set(MULTI_CONFIG OFF)
 endif()
 
 add_executable(mybin mybin.cpp)
@@ -19,7 +19,7 @@ install(TARGETS mybin RUNTIME DESTINATION bin)
 
 add_custom_command(TARGET mybin
   POST_BUILD
-  COMMAND ${CMAKE_COMMAND} "-DSI_CONFIG=${SI_CONFIG}"
+  COMMAND ${CMAKE_COMMAND} "-DMULTI_CONFIG=${MULTI_CONFIG}"
     -P ${CMAKE_CURRENT_SOURCE_DIR}/ExpectInstallFail.cmake
   COMMENT "Install Project"
 )
diff --git a/Tests/MissingInstall/ExpectInstallFail.cmake b/Tests/MissingInstall/ExpectInstallFail.cmake
index 198eb72..a9eb2fb 100644
--- a/Tests/MissingInstall/ExpectInstallFail.cmake
+++ b/Tests/MissingInstall/ExpectInstallFail.cmake
@@ -1,3 +1,9 @@
+if(MULTI_CONFIG)
+  set(SI_CONFIG --config $<CONFIGURATION>)
+else()
+  set(SI_CONFIG)
+endif()
+
 execute_process(
   COMMAND ${CMAKE_COMMAND}
     --build .

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

Summary of changes:
 Tests/MissingInstall/CMakeLists.txt          |    6 +++---
 Tests/MissingInstall/ExpectInstallFail.cmake |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake