[Cmake-commits] CMake branch, master, updated. v3.6.0-rc2-176-gd637809

2016-06-18 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  d6378091361623a9018925b9cfb2708f6a0183f4 (commit)
  from  2e351f892e8eeaec2ecfe3b8a047c340a8718f10 (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=d6378091361623a9018925b9cfb2708f6a0183f4
commit d6378091361623a9018925b9cfb2708f6a0183f4
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Sun Jun 19 00:01:06 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Sun Jun 19 00:01:06 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ac145cf..520fdeb 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 20160618)
+set(CMake_VERSION_PATCH 20160619)
 #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-rc2-410-gbb9d46a

2016-06-18 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  bb9d46a0c05ba8ee02686eb2bb6b54653154efac (commit)
   via  e36e5a2680f34c64773944b152e5337f8951a644 (commit)
  from  c4b7479bd0583670302562c9d1841fa13b3c8fea (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=bb9d46a0c05ba8ee02686eb2bb6b54653154efac
commit bb9d46a0c05ba8ee02686eb2bb6b54653154efac
Merge: c4b7479 e36e5a2
Author: Gregor Jasny 
AuthorDate: Sat Jun 18 17:23:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jun 18 17:23:56 2016 -0400

Merge topic 'xcode-bundle-extension' into next

e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36e5a2680f34c64773944b152e5337f8951a644
commit e36e5a2680f34c64773944b152e5337f8951a644
Author: Gregor Jasny 
AuthorDate: Sat Jun 18 22:59:40 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Jun 18 23:23:32 2016 +0200

Xcode: Properly handle BUNDLE_EXTENSION

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index d30830a..e82cb16 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1801,6 +1801,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   extraLinkOptions += " ";
   extraLinkOptions += createFlags;
 }
+const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION");
+if (ext) {
+  buildSettings->AddAttribute("WRAPPER_EXTENSION",
+  this->CreateString(ext));
+}
 std::string plist = this->ComputeInfoPListLocation(gtgt);
 // Xcode will create the final version of Info.plist at build time,
 // so let it replace the cfbundle name. This avoids creating
diff --git a/Tests/CFBundleTest/CMakeLists.txt 
b/Tests/CFBundleTest/CMakeLists.txt
index 5cda527..0fe6bb7 100644
--- a/Tests/CFBundleTest/CMakeLists.txt
+++ b/Tests/CFBundleTest/CMakeLists.txt
@@ -50,7 +50,6 @@ set_source_files_properties(
 set_target_properties(CFBundleTest PROPERTIES
 BUNDLE 1
 BUNDLE_EXTENSION plugin
-XCODE_ATTRIBUTE_WRAPPER_EXTENSION plugin  #sets the extension to .plugin
 XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle
 XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
 MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |5 +
 Tests/CFBundleTest/CMakeLists.txt |1 -
 2 files changed, 5 insertions(+), 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-rc2-408-gc4b7479

2016-06-18 Thread Rolf Eike Beer 
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  c4b7479bd0583670302562c9d1841fa13b3c8fea (commit)
   via  3213b747a84a4e584e9edc6bd8c114b809b18bec (commit)
  from  449e74eba7e64a4f83aca3c8d8321269c5967541 (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=c4b7479bd0583670302562c9d1841fa13b3c8fea
commit c4b7479bd0583670302562c9d1841fa13b3c8fea
Merge: 449e74e 3213b74
Author: Rolf Eike Beer 
AuthorDate: Sat Jun 18 08:37:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jun 18 08:37:09 2016 -0400

Merge topic 'pkgconfig-targets' into next

3213b747 FindPkgConfig: define the imported targets also when the data 
comes from cache


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3213b747a84a4e584e9edc6bd8c114b809b18bec
commit 3213b747a84a4e584e9edc6bd8c114b809b18bec
Author: Rolf Eike Beer 
AuthorDate: Sat Jun 18 14:35:21 2016 +0200
Commit: Rolf Eike Beer 
CommitDate: Sat Jun 18 14:36:54 2016 +0200

FindPkgConfig: define the imported targets also when the data comes from 
cache

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 644687c..9e4c84e 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -591,12 +591,14 @@ endmacro()
XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
 #]]
 macro(pkg_check_modules _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR 
__pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT 
${_prefix}_FOUND)
-_pkgconfig_parse_options   (_pkg_modules _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
 _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" 
${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} "${_prefix}" 
${_pkg_modules})
 
 _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+  elseif (${_prefix}_FOUND and ${_imp_target})
+_pkg_create_imp_target("${_prefix}" _no_cmake_path 
_no_cmake_environment_path)
   endif()
 endmacro()
 
@@ -619,10 +621,10 @@ endmacro()
 pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
 #]]
 macro(pkg_search_module _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR 
__pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT 
${_prefix}_FOUND)
 set(_pkg_modules_found 0)
-_pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
 
 if (NOT ${_pkg_is_silent})
   message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
@@ -646,6 +648,8 @@ macro(pkg_search_module _prefix _module0)
 endif()
 
 _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+  elseif (${_prefix}_FOUND and ${_imp_target})
+_pkg_create_imp_target("${_prefix}" _no_cmake_path 
_no_cmake_environment_path)
   endif()
 endmacro()
 

---

Summary of changes:


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-rc2-406-g449e74e

2016-06-18 Thread Rolf Eike Beer 
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  449e74eba7e64a4f83aca3c8d8321269c5967541 (commit)
   via  f1fe8c18ac1fbc0e8c482064319d51812dabc615 (commit)
   via  2e351f892e8eeaec2ecfe3b8a047c340a8718f10 (commit)
  from  af3d9d44d0d2b5b78c736add58d39467094b4100 (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=449e74eba7e64a4f83aca3c8d8321269c5967541
commit 449e74eba7e64a4f83aca3c8d8321269c5967541
Merge: af3d9d4 f1fe8c1
Author: Rolf Eike Beer 
AuthorDate: Sat Jun 18 08:35:53 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jun 18 08:35:53 2016 -0400

Merge topic 'pkgconfig-targets' into next

f1fe8c18 FindPkgConfig: define the imported targets also when the data 
comes from cache
2e351f89 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1fe8c18ac1fbc0e8c482064319d51812dabc615
commit f1fe8c18ac1fbc0e8c482064319d51812dabc615
Author: Rolf Eike Beer 
AuthorDate: Sat Jun 18 14:35:21 2016 +0200
Commit: Rolf Eike Beer 
CommitDate: Sat Jun 18 14:35:21 2016 +0200

FindPkgConfig: define the imported targets also when the data comes from 
cache

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 33290c4..c4ac0d5 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -595,12 +595,14 @@ endmacro()
XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
 #]]
 macro(pkg_check_modules _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR 
__pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT 
${_prefix}_FOUND)
-_pkgconfig_parse_options   (_pkg_modules _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
 _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" 
${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} "${_prefix}" 
${_pkg_modules})
 
 _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+  elseif (${_prefix}_FOUND and ${_imp_target})
+_pkg_create_imp_target("${_prefix}" _no_cmake_path 
_no_cmake_environment_path)
   endif()
 endmacro()
 
@@ -623,10 +625,10 @@ endmacro()
 pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
 #]]
 macro(pkg_search_module _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR 
__pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT 
${_prefix}_FOUND)
 set(_pkg_modules_found 0)
-_pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent 
_no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
 
 if (NOT ${_pkg_is_silent})
   message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
@@ -650,6 +652,8 @@ macro(pkg_search_module _prefix _module0)
 endif()
 
 _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+  elseif (${_prefix}_FOUND and ${_imp_target})
+_pkg_create_imp_target("${_prefix}" _no_cmake_path 
_no_cmake_environment_path)
   endif()
 endmacro()
 

---

Summary of changes:
 Modules/FindPkgConfig.cmake |8 ++--
 Source/CMakeVersion.cmake   |2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)


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