[Cmake-commits] CMake branch, next, updated. v3.1.0-1231-g1090b10

[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  1090b107730fac0ae870e6da634fdea6aaec50af (commit)
       via  82a0307adb897fa9a746d4a297058d34e422e8c9 (commit)
      from  efb496dcefde4cd2114375cd363ae4580624cff4 (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=1090b107730fac0ae870e6da634fdea6aaec50af
commit 1090b107730fac0ae870e6da634fdea6aaec50af
Merge: efb496d 82a0307
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 09:42:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 09:42:47 2014 -0500

    Merge topic 'osx-cfbundle-tweaks' into next
    
    82a0307a Tests/CFBundleTest: Fix build output locations


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82a0307adb897fa9a746d4a297058d34e422e8c9
commit 82a0307adb897fa9a746d4a297058d34e422e8c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 09:41:15 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 18 09:41:15 2014 -0500

    Tests/CFBundleTest: Fix build output locations

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 87ab29e..568fc86 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1942,6 +1942,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
         --build-two-config
         ${build_generator_args}
         --build-project CFBundleTest
+        --build-config $<CONFIGURATION>
         --build-options ${build_options}
         --test-command
         ${CMAKE_CMAKE_COMMAND} -DCTEST_CONFIGURATION_TYPE=$<CONFIGURATION>

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

Summary of changes:
 Tests/CFBundleTest/VerifyResult.cmake |    9 +++------
 Tests/CMakeLists.txt                  |    1 +
 2 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake