[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-236-g3a04494

2016-06-24 Thread 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, master has been updated
   via  3a0449439f03981865b8d43815ac9b6292574a47 (commit)
  from  f05657de9d1ae7247a527186830d37702ec30de4 (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=3a0449439f03981865b8d43815ac9b6292574a47
commit 3a0449439f03981865b8d43815ac9b6292574a47
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Sat Jun 25 00:01:05 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Sat Jun 25 00:01:05 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 40f8e11..a1d1eb3 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160624)
+set(CMake_VERSION_PATCH 20160625)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-530-g2152e11

2016-06-24 Thread Gregor Jasny via Cmake-commits 
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  2152e11e7a4f9d5bb80e224265e3aba40c92a060 (commit)
   via  e301be8c4f82aeab9a5693e611d93b22a901866e (commit)
   via  3b9d0962e79e8bdeec8a92684d62172197c1ae6d (commit)
   via  1721529fa69b60ec2717e85ef8730de549e226b1 (commit)
   via  f05657de9d1ae7247a527186830d37702ec30de4 (commit)
  from  41a51131f9a253459577cbe4562be5dd368a517d (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=2152e11e7a4f9d5bb80e224265e3aba40c92a060
commit 2152e11e7a4f9d5bb80e224265e3aba40c92a060
Merge: 41a5113 e301be8
Author: Gregor Jasny 
AuthorDate: Fri Jun 24 17:26:16 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jun 24 17:26:16 2016 -0400

Merge topic 'app-framework-bundle-extension' into next

e301be8c Update documentation about bundle extensions
3b9d0962 Honor BUNDLE_EXTENSION also for Frameworks (#14742)
1721529f Honor BUNDLE_EXTENSION also for App Bundles (#16148)
f05657de CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e301be8c4f82aeab9a5693e611d93b22a901866e
commit e301be8c4f82aeab9a5693e611d93b22a901866e
Author: Gregor Jasny 
AuthorDate: Fri Jun 24 23:17:22 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jun 24 23:17:22 2016 +0200

Update documentation about bundle extensions

diff --git a/Help/prop_tgt/BUNDLE_EXTENSION.rst 
b/Help/prop_tgt/BUNDLE_EXTENSION.rst
index ea265b3..6b3d580 100644
--- a/Help/prop_tgt/BUNDLE_EXTENSION.rst
+++ b/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -1,7 +1,8 @@
 BUNDLE_EXTENSION
 
 
-The file extension used to name a :prop_tgt:`BUNDLE` target on the OS X and 
iOS.
+The file extension used to name a :prop_tgt:`BUNDLE`, a :prop_tgt:`FRAMEWORK`,
+or a :prop_tgt:`MACOSX_BUNDLE` target on the OS X and iOS.
 
-The default value is ``bundle`` - you can also use ``plugin`` or whatever
-file extension is required by the host app for your bundle.
+The default value is ``bundle``, ``framework``, or ``app`` for the respective
+target types.
diff --git a/Help/release/dev/app-framework-bundle-extension.rst 
b/Help/release/dev/app-framework-bundle-extension.rst
new file mode 100644
index 000..01855a2
--- /dev/null
+++ b/Help/release/dev/app-framework-bundle-extension.rst
@@ -0,0 +1,5 @@
+app-framework-bundle-extension
+--
+
+* On Apple platforms the :prop_tgt:`BUNDLE_EXTENSION` now also applies to
+  Frameworks and App Bundles.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b9d0962e79e8bdeec8a92684d62172197c1ae6d
commit 3b9d0962e79e8bdeec8a92684d62172197c1ae6d
Author: Gregor Jasny 
AuthorDate: Sun Jun 19 21:26:40 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jun 24 23:06:45 2016 +0200

Honor BUNDLE_EXTENSION also for Frameworks (#14742)

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4db1bd9..eec3422 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1396,7 +1396,12 @@ std::string 
cmGeneratorTarget::GetFrameworkDirectory(const std::string& config,
 {
   std::string fpath;
   fpath += this->GetOutputName(config, false);
-  fpath += ".framework";
+  fpath += ".";
+  const char* ext = this->GetProperty("BUNDLE_EXTENSION");
+  if (!ext) {
+ext = "framework";
+  }
+  fpath += ext;
   if (!rootDir && !this->Makefile->PlatformIsAppleIos()) {
 fpath += "/Versions/";
 fpath += this->GetFrameworkVersion();
@@ -3013,7 +3018,13 @@ void cmGeneratorTarget::GetFullNameInternal(const 
std::string& config,
   std::string fw_prefix;
   if (this->IsFrameworkOnApple()) {
 fw_prefix = this->GetOutputName(config, false);
-fw_prefix += ".framework/";
+fw_prefix += ".";
+const char* ext = this->GetProperty("BUNDLE_EXTENSION");
+if (!ext) {
+  ext = "framework";
+}
+fw_prefix += ext;
+fw_prefix += "/";
 targetPrefix = fw_prefix.c_str();
 targetSuffix = 0;
   }
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index d27c579..91a90b2 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1843,6 +1843,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 std::string fw_version = gtgt->GetFrameworkVersion();
 buildSettings->AddAttribute("FRAMEWORK_VERSION",
 this->CreateString(fw_version));
+const char* ext =

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-525-g41a5113

2016-06-24 Thread Daniel Pfeifer 
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  41a51131f9a253459577cbe4562be5dd368a517d (commit)
   via  8fd49ae83957bf1504a94a5ed2c8ccf89dbc5f09 (commit)
  from  272f159ea60d27ff817bd32335a8edcf2a994fcd (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=41a51131f9a253459577cbe4562be5dd368a517d
commit 41a51131f9a253459577cbe4562be5dd368a517d
Merge: 272f159 8fd49ae
Author: Daniel Pfeifer 
AuthorDate: Fri Jun 24 02:00:52 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jun 24 02:00:52 2016 -0400

Merge topic 'compiler-features' into next

8fd49ae8 fixup! Make C++ feature checks extensible


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fd49ae83957bf1504a94a5ed2c8ccf89dbc5f09
commit 8fd49ae83957bf1504a94a5ed2c8ccf89dbc5f09
Author: Daniel Pfeifer 
AuthorDate: Fri Jun 24 07:58:35 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Fri Jun 24 07:59:31 2016 +0200

fixup! Make C++ feature checks extensible

diff --git a/Source/Checks/cm_cxx_features.cmake 
b/Source/Checks/cm_cxx_features.cmake
index 20a9348..18dbaf8 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -9,6 +9,10 @@ function(cm_check_cxx_feature name)
   CMAKE_FLAGS -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
   OUTPUT_VARIABLE OUTPUT
   )
+# If using the feature causes warnings, treat it as broken/unavailable.
+if(OUTPUT MATCHES "warning")
+  set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
+endif()
 if(CMake_HAVE_CXX_${FEATURE})
   message(STATUS "Checking if compiler supports C++ ${name} - yes")
   file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log

---

Summary of changes:
 Source/Checks/cm_cxx_features.cmake |4 
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits