[Cmake-commits] CMake branch, master, updated. v3.7.1-909-g6154a2c

[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  6154a2cddcdb297b1aef20f501fec9af7d7b5262 (commit)
  from  4918cd8c98938ab245d7fea74ba6e20f3ec8ef8b (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=6154a2cddcdb297b1aef20f501fec9af7d7b5262
commit 6154a2cddcdb297b1aef20f501fec9af7d7b5262
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Dec 21 00:01:04 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Dec 21 00:01:04 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ad92a62..ff5c776 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 7)
-set(CMake_VERSION_PATCH 20161220)
+set(CMake_VERSION_PATCH 20161221)
 #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.7.1-1834-ga1d713f

[Domen Vrankar]

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  a1d713f219bab2475c540af474d80c4949234da0 (commit)
   via  b8e990fade3ad1e8b4b533ada1e86411a7abf39e (commit)
  from  b195005741d7ec9f766fd2bd0c3d0287fed7ef78 (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=a1d713f219bab2475c540af474d80c4949234da0
commit a1d713f219bab2475c540af474d80c4949234da0
Merge: b195005 b8e990f
Author: Domen Vrankar 
AuthorDate: Tue Dec 20 17:17:14 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 20 17:17:14 2016 -0500

Merge topic 'cpack-deb-md5sums-paths-fix' into next

b8e990fa CPack/Deb invalid md5sums file fix


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8e990fade3ad1e8b4b533ada1e86411a7abf39e
commit b8e990fade3ad1e8b4b533ada1e86411a7abf39e
Author: Domen Vrankar 
AuthorDate: Tue Dec 20 23:08:52 2016 +0100
Commit: Domen Vrankar 
CommitDate: Tue Dec 20 23:08:52 2016 +0100

CPack/Deb invalid md5sums file fix

Monolithic deb packages were packaged
with invalid md5sums file as trailing
slash in path was causing string replace
to fail and preserve build path.

Fixes #16517

diff --git a/Source/CPack/cmCPackDebGenerator.cxx 
b/Source/CPack/cmCPackDebGenerator.cxx
index 36566a4..d45eb78 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -173,7 +173,10 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
 std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
 this->GetOutputExtension());
   // all GROUP in one vs all COMPONENT in one
-  localToplevel += "/" + compInstDirName;
+  // if must be here otherwise non component paths have a trailing / while
+  // components don't
+  if (!compInstDirName.empty())
+localToplevel += "/" + compInstDirName;
 
   /* replace the TEMP DIRECTORY with the component one */
   this->SetOption("CPACK_TEMPORARY_DIRECTORY", localToplevel.c_str());
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake 
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..96141e9 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -15,6 +15,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true 
"COMPONENT")
 run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
 run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
 run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
+run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")
 run_cpack_test(MINIMAL "RPM;DEB;TGZ" false "MONOLITHIC")
 run_cpack_test_subtests(PACKAGE_CHECKSUM 
"invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
 run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake 
b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
new file mode 100644
index 000..6142eb3
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake
@@ -0,0 +1,2 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake 
b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
new file mode 100644
index 000..fbdda9c
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
@@ -0,0 +1,3 @@
+set(whitespaces_ "[\t\n\r ]*")
+set(md5sums_md5sums "^.* usr/foo/CMakeLists\.txt${whitespaces_}$")
+verifyDebControl("${FOUND_FILE_1}" "md5sums" "md5sums")
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake 
b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
new file mode 100644
index 000..15c5892
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake
@@ -0,0 +1,5 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+  set(CPACK_COMPONENTS_ALL test)
+endif()

---

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |5 -
 Tests/RunCMake/CPack/RunCMakeTest.cmake  |1 +
 Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake |0
 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake|3 +++
 Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake|5 +
 5 files changed, 13 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake (100%)
 

[Cmake-commits] CMake branch, next, updated. v3.7.1-1832-gb195005

[Domen Vrankar]

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  b195005741d7ec9f766fd2bd0c3d0287fed7ef78 (commit)
   via  f7301e6e5f64cb42573ea7128eef3e7ba91a7779 (commit)
  from  ebb7ff5b9ba490a8645de7092c729f211b8cd464 (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=b195005741d7ec9f766fd2bd0c3d0287fed7ef78
commit b195005741d7ec9f766fd2bd0c3d0287fed7ef78
Merge: ebb7ff5 f7301e6
Author: Domen Vrankar 
AuthorDate: Tue Dec 20 15:13:54 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 20 15:13:54 2016 -0500

Merge topic 'cpack-deb-package-version-override-fix' into next

f7301e6e CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7301e6e5f64cb42573ea7128eef3e7ba91a7779
commit f7301e6e5f64cb42573ea7128eef3e7ba91a7779
Author: Daniel Pfeifer 
AuthorDate: Tue Dec 20 14:09:20 2016 +0100
Commit: Domen Vrankar 
CommitDate: Tue Dec 20 21:07:25 2016 +0100

CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index bee69d9..ddf8b23 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -914,7 +914,7 @@ function(cpack_deb_prepare_package_vars)
 extract_so_info("${_FILE}" libname soversion)
 if(libname AND soversion)
   list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST
-   "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} 
(${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_PACKAGE_VERSION})")
+   "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} 
(${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} 
${CPACK_DEBIAN_PACKAGE_VERSION})")
 else()
   message(AUTHOR_WARNING "Shared library '${_FILE}' is missing soname 
or soversion. Library will not be added to DEBIAN/shlibs control file.")
 endif()
@@ -967,7 +967,7 @@ function(cpack_deb_prepare_package_vars)
   # Patch package file name to be in corrent debian format:
   # _-_.deb
   set(CPACK_OUTPUT_FILE_NAME
-
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
 else()
   cmake_policy(PUSH)
 cmake_policy(SET CMP0010 NEW)

---

Summary of changes:
 Modules/CPackDeb.cmake |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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.7.1-1830-gebb7ff5

[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  ebb7ff5b9ba490a8645de7092c729f211b8cd464 (commit)
   via  7ac84052c4f6a22349fde7b43b8b073a22bf30f1 (commit)
   via  4918cd8c98938ab245d7fea74ba6e20f3ec8ef8b (commit)
  from  b55c0379eeab76a40a0a8291d1e5ab53b0014689 (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=ebb7ff5b9ba490a8645de7092c729f211b8cd464
commit ebb7ff5b9ba490a8645de7092c729f211b8cd464
Merge: b55c037 7ac8405
Author: Rolf Eike Beer 
AuthorDate: Tue Dec 20 12:38:36 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 20 12:38:36 2016 -0500

Merge topic 'sparc-libatomic' into next

7ac84052 explicitely link against libatomic on Linux/sparc for 
__atomic_fetch_add_4()
4918cd8c CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ac84052c4f6a22349fde7b43b8b073a22bf30f1
commit 7ac84052c4f6a22349fde7b43b8b073a22bf30f1
Author: Rolf Eike Beer 
AuthorDate: Mon Dec 19 14:47:01 2016 +0100
Commit: Rolf Eike Beer 
CommitDate: Tue Dec 20 18:38:15 2016 +0100

explicitely link against libatomic on Linux/sparc for __atomic_fetch_add_4()

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d15fdbe..388bf89 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -785,6 +785,15 @@ target_link_libraries(CMakeLib cmsys
   ${CMake_KWIML_LIBRARIES}
   )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES 
"sparc")
+  # the atomic instructions are implemented using libatomic on some platforms,
+  # so linking to that may be required
+  check_library_exists(atomic __atomic_fetch_add_4 "" LIBATOMIC_NEEDED)
+  if(LIBATOMIC_NEEDED)
+target_link_libraries(CMakeLib atomic)
+  endif()
+endif()
+
 # On Apple we need CoreFoundation
 if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")

---

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.7.1-1827-gb55c037

[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  b55c0379eeab76a40a0a8291d1e5ab53b0014689 (commit)
   via  799e55a6a525e255c7b3c49e1afa9a62f463ca96 (commit)
  from  934289dd5dce80d4f8e53b5dfdb3c300e3dbf5b2 (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=b55c0379eeab76a40a0a8291d1e5ab53b0014689
commit b55c0379eeab76a40a0a8291d1e5ab53b0014689
Merge: 934289d 799e55a
Author: Rolf Eike Beer 
AuthorDate: Tue Dec 20 12:38:04 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 20 12:38:04 2016 -0500

Merge topic 'sparc-libatomic' into next

799e55a6 FIXUP: match libatomic for all sparc


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=799e55a6a525e255c7b3c49e1afa9a62f463ca96
commit 799e55a6a525e255c7b3c49e1afa9a62f463ca96
Author: Rolf Eike Beer 
AuthorDate: Tue Dec 20 18:37:52 2016 +0100
Commit: Rolf Eike Beer 
CommitDate: Tue Dec 20 18:37:52 2016 +0100

FIXUP: match libatomic for all sparc

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7342524..388bf89 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -785,7 +785,7 @@ target_link_libraries(CMakeLib cmsys
   ${CMake_KWIML_LIBRARIES}
   )
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL 
"sparc")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES 
"sparc")
   # the atomic instructions are implemented using libatomic on some platforms,
   # so linking to that may be required
   check_library_exists(atomic __atomic_fetch_add_4 "" LIBATOMIC_NEEDED)

---

Summary of changes:
 Source/CMakeLists.txt |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