[Cmake-commits] CMake branch, next, updated. v3.1.0-1268-gcea029e

[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  cea029e066d55935e52e0b6558d8d6c41293c318 (commit)
       via  b189c5994d94b8dd0afdf14844db4a4be28cf4b1 (commit)
      from  7b44de887d93ce747a8afcfbf8ad4a8691895261 (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=cea029e066d55935e52e0b6558d8d6c41293c318
commit cea029e066d55935e52e0b6558d8d6c41293c318
Merge: 7b44de8 b189c59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 19 08:24:38 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 19 08:24:38 2014 -0500

    Merge topic 'osx-cfbundle-tweaks' into next
    
    b189c599 Tests: Run CFBundleTest only with valid configuration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b189c5994d94b8dd0afdf14844db4a4be28cf4b1
commit b189c5994d94b8dd0afdf14844db4a4be28cf4b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 11:42:19 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 19 08:24:04 2014 -0500

    Tests: Run CFBundleTest only with valid configuration
    
    The verification script needs to know the configuration tested.

diff --git a/Tests/CFBundleTest/VerifyResult.cmake b/Tests/CFBundleTest/VerifyResult.cmake
index e622900..e637bb1 100644
--- a/Tests/CFBundleTest/VerifyResult.cmake
+++ b/Tests/CFBundleTest/VerifyResult.cmake
@@ -14,13 +14,10 @@ message(STATUS "CTEST_CONFIGURATION_TYPE='${CTEST_CONFIGURATION_TYPE}'")
 message(STATUS "dir='${dir}'")
 message(STATUS "gen='${gen}'")
 
-if(gen MATCHES "Make" OR
-   "${CTEST_CONFIGURATION_TYPE}" STREQUAL "" OR
-   "${CTEST_CONFIGURATION_TYPE}" STREQUAL "." OR
-   "${CTEST_CONFIGURATION_TYPE}" STREQUAL "NoConfig")
-  set(expected_filename "${dir}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest")
-else()
+if(gen STREQUAL "Xcode")
   set(expected_filename "${dir}/${CTEST_CONFIGURATION_TYPE}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest")
+else()
+  set(expected_filename "${dir}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest")
 endif()
 
 if(NOT EXISTS "${expected_filename}")
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 33c18ce..568fc86 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1935,16 +1935,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
         ${BundleTestInstallDir}/Applications/SecondBundleExe.app/Contents/MacOS/SecondBundleExe)
       list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleTest")
 
-      add_test(CFBundleTest ${CMAKE_CTEST_COMMAND}
+      add_test(NAME CFBundleTest COMMAND ${CMAKE_CTEST_COMMAND}
         --build-and-test
         "${CMake_SOURCE_DIR}/Tests/CFBundleTest"
         "${CMake_BINARY_DIR}/Tests/CFBundleTest"
         --build-two-config
         ${build_generator_args}
         --build-project CFBundleTest
+        --build-config $<CONFIGURATION>
         --build-options ${build_options}
         --test-command
-        ${CMAKE_CMAKE_COMMAND} -DCTEST_CONFIGURATION_TYPE=\${CTEST_CONFIGURATION_TYPE}
+        ${CMAKE_CMAKE_COMMAND} -DCTEST_CONFIGURATION_TYPE=$<CONFIGURATION>
         -Ddir=${CMake_BINARY_DIR}/Tests/CFBundleTest
         -Dgen=${CMAKE_GENERATOR}
         -P ${CMake_SOURCE_DIR}/Tests/CFBundleTest/VerifyResult.cmake)

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

Summary of changes:


hooks/post-receive
-- 
CMake