[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-643-ged76ca4

[Kitware Robot]

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  ed76ca4476a04a553ffd8e04388c4e91123d04c7 (commit)
       via  8206c28bd6e6d7849e80a68cdfef79ff5a1031a3 (commit)
      from  5aa11aa1711543fdc55126798edd39626f30cb23 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed76ca4476a04a553ffd8e04388c4e91123d04c7
commit ed76ca4476a04a553ffd8e04388c4e91123d04c7
Merge: 5aa11aa 8206c28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 19:29:20 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 31 15:29:23 2017 -0400

    Stage topic 'test-CMake.GetPrerequisites-config-message'
    
    Topic-id: 23435
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/654


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8206c28bd6e6d7849e80a68cdfef79ff5a1031a3
commit 8206c28bd6e6d7849e80a68cdfef79ff5a1031a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 31 15:20:01 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 31 15:20:01 2017 -0400

    Tests: Fix CMake.GetPrerequisites test config message
    
    Since commit v2.8.11~239^2~1 (ProcessorCount test: fix path to
    cmsysTestsCxx executable, 2013-01-24) we accidentally printed a literal
    `${CTEST_CONFIGURATION_TYPE}` instead of the actual build configuration.
    Update the message to use the `$<CONFIG>` generator expression to get
    the real build configuration used.

diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt
index d5524c3..aa7ae25 100644
--- a/Tests/CMakeTests/CMakeLists.txt
+++ b/Tests/CMakeTests/CMakeLists.txt
@@ -53,10 +53,7 @@ set(EndStuff_PreArgs
   )
 AddCMakeTest(EndStuff "${EndStuff_PreArgs}")
 
-set(GetPrerequisites_PreArgs
-  "-DCTEST_CONFIGURATION_TYPE:STRING=\\\${CTEST_CONFIGURATION_TYPE}"
-  )
-AddCMakeTest(GetPrerequisites "${GetPrerequisites_PreArgs}")
+AddCMakeTest(GetPrerequisites "-DConfiguration:STRING=$<CONFIG>")
 
 if(GIT_EXECUTABLE)
   set(PolicyCheck_PreArgs
diff --git a/Tests/CMakeTests/GetPrerequisitesTest.cmake.in b/Tests/CMakeTests/GetPrerequisitesTest.cmake.in
index 89ca735..7325b87 100644
--- a/Tests/CMakeTests/GetPrerequisitesTest.cmake.in
+++ b/Tests/CMakeTests/GetPrerequisitesTest.cmake.in
@@ -2,18 +2,15 @@
 #
 include(GetPrerequisites)
 
-set(CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@")
-set(CMAKE_CONFIGURATION_TYPES "@CMAKE_CONFIGURATION_TYPES@")
 set(CMAKE_EXECUTABLE_SUFFIX "@CMAKE_EXECUTABLE_SUFFIX@")
 
 
 message(STATUS "=============================================================================")
 message(STATUS "CTEST_FULL_OUTPUT (Avoid ctest truncation of output)")
 message(STATUS "")
-message(STATUS "CMAKE_BUILD_TYPE='${CMAKE_BUILD_TYPE}'")
-message(STATUS "CMAKE_CONFIGURATION_TYPES='${CMAKE_CONFIGURATION_TYPES}'")
+message(STATUS "Configuration '${Configuration}'")
+message(STATUS "CMAKE_COMMAND='${CMAKE_COMMAND}'")
 message(STATUS "CMAKE_EXECUTABLE_SUFFIX='${CMAKE_EXECUTABLE_SUFFIX}'")
-message(STATUS "CTEST_CONFIGURATION_TYPE='${CTEST_CONFIGURATION_TYPE}'")
 message(STATUS "")
 
 

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

Summary of changes:
 Tests/CMakeTests/CMakeLists.txt                |    5 +----
 Tests/CMakeTests/GetPrerequisitesTest.cmake.in |    7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake