[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1213-g23fefd0

[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  23fefd0ba3d758fd095b2e662ade88df2350a520 (commit)
       via  e02814d487a0e8ab58d8358991eada7adca14cb2 (commit)
       via  3a605693a5349a252bb9c3eb472d02b1c23886e3 (commit)
       via  207b7af00be53f0779c4896f311f130455d3aadd (commit)
      from  d43b20fb1b6c136548bd60acb74df1cc71d3a8fc (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=23fefd0ba3d758fd095b2e662ade88df2350a520
commit 23fefd0ba3d758fd095b2e662ade88df2350a520
Merge: d43b20f e02814d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 11:46:30 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 17 11:46:30 2014 -0500

    Merge topic 'osx-cfbundle-tweaks' into next
    
    e02814d4 Tests: Run CFBundleTest only with valid configuration
    3a605693 Xcode: Call IsCFBundleOnApple to decide if bundle is being built
    207b7af0 cmTarget: Use GetCFBundleDirectory within GetFullNameInternal


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e02814d487a0e8ab58d8358991eada7adca14cb2
commit e02814d487a0e8ab58d8358991eada7adca14cb2
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: Wed Dec 17 11:42:32 2014 -0500

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

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 33c18ce..87ab29e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1935,7 +1935,7 @@ ${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"
@@ -1944,7 +1944,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
         --build-project CFBundleTest
         --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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a605693a5349a252bb9c3eb472d02b1c23886e3
commit 3a605693a5349a252bb9c3eb472d02b1c23886e3
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Dec 16 22:22:08 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 11:26:10 2014 -0500

    Xcode: Call IsCFBundleOnApple to decide if bundle is being built
    
    Narrow down the decision if a CFBundle is built to one place.
    This is a preparation patch to add another target property
    which, if set, will imply BUNDLE.  Having only one function
    which will have to look at both properties helps to keep code
    clean.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index de6e915..6a480a9 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1925,7 +1925,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
-    if (target.GetPropertyAsBool("BUNDLE"))
+    if (target.IsCFBundleOnApple())
       {
       // It turns out that a BUNDLE is basically the same
       // in many ways as an application bundle, as far as

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=207b7af00be53f0779c4896f311f130455d3aadd
commit 207b7af00be53f0779c4896f311f130455d3aadd
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Dec 16 22:22:07 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 11:24:02 2014 -0500

    cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
    
    Replace duplicated code by call to GetCFBundleDirectory.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 37aa26e..9c4801e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4056,15 +4056,8 @@ void cmTarget::GetFullNameInternal(const std::string& config,
 
   if(this->IsCFBundleOnApple())
     {
-    fw_prefix = this->GetOutputName(config, false);
-    fw_prefix += ".";
-    const char *ext = this->GetProperty("BUNDLE_EXTENSION");
-    if (!ext)
-      {
-      ext = "bundle";
-      }
-    fw_prefix += ext;
-    fw_prefix += "/Contents/MacOS/";
+    fw_prefix = this->GetCFBundleDirectory(config, false);
+    fw_prefix += "/";
     targetPrefix = fw_prefix.c_str();
     targetSuffix = 0;
     }

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    2 +-
 Source/cmTarget.cxx               |   11 ++---------
 Tests/CMakeLists.txt              |    4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake