[Cmake-commits] CMake branch, master, updated. v3.6.1-749-g8973460
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 897346032b33ebd033cda9bcb5d094f1c112f37d (commit) from a749ab8f3ddaf2eab470d1d567be69acab359f63 (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=897346032b33ebd033cda9bcb5d094f1c112f37d commit 897346032b33ebd033cda9bcb5d094f1c112f37d Author: Kitware Robot AuthorDate: Sat Aug 27 00:01:05 2016 -0400 Commit: Kitware Robot CommitDate: Sat Aug 27 00:01:05 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e8a4d2c..770b6bd 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 20160826) +set(CMake_VERSION_PATCH 20160827) #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, release, updated. v3.6.1-24-g83fd4a7
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, release has been updated via 83fd4a7039f46e458186274feb3ba397a4f58bb8 (commit) via f699323ade84bb672ed0998de73c6f0333981bc1 (commit) from fc552ce1c70e702d26508261090a07ebe1c426a1 (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 - --- Summary of changes: Source/cmDependsFortran.cxx |6 ++ 1 file changed, 6 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-748-ga749ab8
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 a749ab8f3ddaf2eab470d1d567be69acab359f63 (commit) via 83fd4a7039f46e458186274feb3ba397a4f58bb8 (commit) from 21c946eef4e11e6161cc46b265fbeb128ea1baf7 (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 - --- 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.1-1502-g61cdf5d
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 61cdf5d4af56e5e5f7d30448828cc7a35a8ae4a7 (commit) via a749ab8f3ddaf2eab470d1d567be69acab359f63 (commit) via 83fd4a7039f46e458186274feb3ba397a4f58bb8 (commit) from c583e887954417fd07e64061039da5184d35ee69 (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=61cdf5d4af56e5e5f7d30448828cc7a35a8ae4a7 commit 61cdf5d4af56e5e5f7d30448828cc7a35a8ae4a7 Merge: c583e88 a749ab8 Author: Brad King AuthorDate: Fri Aug 26 10:04:58 2016 -0400 Commit: Brad King CommitDate: Fri Aug 26 10:04:58 2016 -0400 Merge branch 'master' into next --- 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.1-1499-gc583e88
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 c583e887954417fd07e64061039da5184d35ee69 (commit)
via 1f4aeb1739fb632ab5162a977764b51736728edc (commit)
from 037fa07721e5c990f30e8116d987916d87fddd56 (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=c583e887954417fd07e64061039da5184d35ee69
commit c583e887954417fd07e64061039da5184d35ee69
Merge: 037fa07 1f4aeb1
Author: Brad King
AuthorDate: Fri Aug 26 10:04:20 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 10:04:20 2016 -0400
Merge topic 'vs-NsightTegra-empty-version' into next
1f4aeb17 VS: Fix out-of-bounds write on empty Nsight Tegra version
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f4aeb1739fb632ab5162a977764b51736728edc
commit 1f4aeb1739fb632ab5162a977764b51736728edc
Author: Fujii Hironori
AuthorDate: Fri Aug 26 15:28:48 2016 +0900
Commit: Brad King
CommitDate: Fri Aug 26 10:01:39 2016 -0400
VS: Fix out-of-bounds write on empty Nsight Tegra version
In cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator,
wrote 0 to this->NsightTegraVersion[-1] if sscanf returns -1 which is
the case of GetNsightTegraVersion is empty.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index fb05976..009f9a2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -183,13 +183,12 @@
cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator(
this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
this->Platform = gg->GetPlatformName();
this->NsightTegra = gg->IsNsightTegra();
- for (int i =
- sscanf(gg->GetNsightTegraVersion().c_str(), "%u.%u.%u.%u",
-&this->NsightTegraVersion[0], &this->NsightTegraVersion[1],
-&this->NsightTegraVersion[2], &this->NsightTegraVersion[3]);
- i < 4; ++i) {
+ for (int i = 0; i < 4; ++i) {
this->NsightTegraVersion[i] = 0;
}
+ sscanf(gg->GetNsightTegraVersion().c_str(), "%u.%u.%u.%u",
+ &this->NsightTegraVersion[0], &this->NsightTegraVersion[1],
+ &this->NsightTegraVersion[2], &this->NsightTegraVersion[3]);
this->MSTools = !this->NsightTegra;
this->TargetCompileAsWinRT = false;
this->BuildFileStream = 0;
---
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx |9 -
1 file changed, 4 insertions(+), 5 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.6.1-1497-g037fa07
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 037fa07721e5c990f30e8116d987916d87fddd56 (commit)
via 38995d19b806e8cc1d43fab0422beefd4c23431f (commit)
from 7184f486f54f39fd1584a876ca67c27da07e97b2 (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=037fa07721e5c990f30e8116d987916d87fddd56
commit 037fa07721e5c990f30e8116d987916d87fddd56
Merge: 7184f48 38995d1
Author: Brad King
AuthorDate: Fri Aug 26 09:56:19 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 09:56:19 2016 -0400
Merge topic 'code-blocks-include-order' into next
38995d19 CodeBlocks: List C++ includes first
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38995d19b806e8cc1d43fab0422beefd4c23431f
commit 38995d19b806e8cc1d43fab0422beefd4c23431f
Author: Kevin Ottens
AuthorDate: Wed Aug 17 22:45:06 2016 +0200
Commit: Brad King
CommitDate: Fri Aug 26 09:55:30 2016 -0400
CodeBlocks: List C++ includes first
When using the Clang Code Model in QtCreator, it turned out that having
the C system include dirs can make it report false positives for most
uses of the STL. This is due to the order the Clang Code Model looks at
the include directories and some C includes in /usr/include could be
incompatible with the used STL if found first.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx
b/Source/cmExtraCodeBlocksGenerator.cxx
index 559974e..6eae26b 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -593,7 +593,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(
includes.end());
std::string systemIncludeDirs = makefile->GetSafeDefinition(
- "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
+ "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
if (!systemIncludeDirs.empty()) {
std::vector dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs);
@@ -601,7 +601,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(
}
systemIncludeDirs = makefile->GetSafeDefinition(
- "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
+ "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
if (!systemIncludeDirs.empty()) {
std::vector dirs;
cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs);
---
Summary of changes:
Source/cmExtraCodeBlocksGenerator.cxx |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.6.1-1495-g7184f48
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 7184f486f54f39fd1584a876ca67c27da07e97b2 (commit) via 21c946eef4e11e6161cc46b265fbeb128ea1baf7 (commit) via 41f03f5fa794e05745ff2975b7d8854e3a4a7792 (commit) via 135c78554944250e9a15efe2bc60e9f8197ff2a1 (commit) via d65584f7a3074ff9887a4e540cfdbd48a4628c22 (commit) via da7111e1a34bd8b85a98ed1ebc14f65c499748be (commit) from 82e65010ed8cbc807604fc618baa7fc176613a8b (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=7184f486f54f39fd1584a876ca67c27da07e97b2 commit 7184f486f54f39fd1584a876ca67c27da07e97b2 Merge: 82e6501 21c946e Author: Brad King AuthorDate: Fri Aug 26 09:46:59 2016 -0400 Commit: Brad King CommitDate: Fri Aug 26 09:46:59 2016 -0400 Merge branch 'master' into next --- 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, master, updated. v3.6.1-744-g41f03f5
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 41f03f5fa794e05745ff2975b7d8854e3a4a7792 (commit)
via 426f97d35300555fc5360698b6a6f0da2ba18169 (commit)
via bc8c0add7f799ad5775e4f229256832e17156b68 (commit)
from 135c78554944250e9a15efe2bc60e9f8197ff2a1 (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=41f03f5fa794e05745ff2975b7d8854e3a4a7792
commit 41f03f5fa794e05745ff2975b7d8854e3a4a7792
Merge: 135c785 426f97d
Author: Brad King
AuthorDate: Fri Aug 26 09:45:36 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 09:45:36 2016 -0400
Merge topic 'cpack-rpm-debuginfo-pkg'
426f97d3 CPack/RPM: Add test for debuginfo package generation
bc8c0add CPack RPM debuginfo packages generation
---
Summary of changes:
Help/release/dev/cpack-rpm-debuginfo-pkg.rst |6 ++
Modules/CPackRPM.cmake | 65 +++-
.../CPack/{DEPENDENCIES.cmake => DEBUGINFO.cmake} | 12 +++-
.../CPack/RPM/DEBUGINFO-ExpectedFiles.cmake| 14 +
Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt |3 +
Tests/RunCMake/CPack/RunCMakeTest.cmake|1 +
6 files changed, 96 insertions(+), 5 deletions(-)
create mode 100644 Help/release/dev/cpack-rpm-debuginfo-pkg.rst
copy Tests/RunCMake/CPack/{DEPENDENCIES.cmake => DEBUGINFO.cmake} (74%)
create mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
create mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.1-746-g21c946e
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 21c946eef4e11e6161cc46b265fbeb128ea1baf7 (commit) via 24e7ccb7ef486191ebb9fca916c70e367c41b2fb (commit) from 41f03f5fa794e05745ff2975b7d8854e3a4a7792 (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=21c946eef4e11e6161cc46b265fbeb128ea1baf7 commit 21c946eef4e11e6161cc46b265fbeb128ea1baf7 Merge: 41f03f5 24e7ccb Author: Brad King AuthorDate: Fri Aug 26 09:45:39 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 26 09:45:39 2016 -0400 Merge topic 'update-curl-script' 24e7ccb7 curl: Update script to get curl from new repository --- Summary of changes: Utilities/Scripts/update-curl.bash |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, master, updated. v3.6.1-741-g135c785
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 135c78554944250e9a15efe2bc60e9f8197ff2a1 (commit) via 20d7da5276704864569fb08259278a08c5f9e725 (commit) via 4ef8a205edf66b652418aa5491436d26fd806175 (commit) from d65584f7a3074ff9887a4e540cfdbd48a4628c22 (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=135c78554944250e9a15efe2bc60e9f8197ff2a1 commit 135c78554944250e9a15efe2bc60e9f8197ff2a1 Merge: d65584f 20d7da5 Author: Brad King AuthorDate: Fri Aug 26 09:45:34 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 26 09:45:34 2016 -0400 Merge topic 'FindwxWidgets-library-path' 20d7da52 FindwxWidgets: Add VS-versioned library directory prefixes 4ef8a205 FindwxWidgets: Add version 3.1.0 --- Summary of changes: Modules/FindwxWidgets.cmake | 19 --- 1 file changed, 16 insertions(+), 3 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, master, updated. v3.6.1-738-gd65584f
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 d65584f7a3074ff9887a4e540cfdbd48a4628c22 (commit) via cd344e3a62e3a6728e5b749cb923104c2c09949c (commit) from da7111e1a34bd8b85a98ed1ebc14f65c499748be (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=d65584f7a3074ff9887a4e540cfdbd48a4628c22 commit d65584f7a3074ff9887a4e540cfdbd48a4628c22 Merge: da7111e cd344e3 Author: Brad King AuthorDate: Fri Aug 26 09:45:31 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 26 09:45:31 2016 -0400 Merge topic 'test-driver-clang-tidy' cd344e3a create_test_sourcelist: Use safer strncpy instead of strcpy --- Summary of changes: Templates/TestDriver.cxx.in | 10 ++ 1 file changed, 6 insertions(+), 4 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, master, updated. v3.6.1-736-gda7111e
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 da7111e1a34bd8b85a98ed1ebc14f65c499748be (commit) via f325ae186d5d235cb90f4fb002a8df56abc050f8 (commit) from ff88df48e8a693f213a44aee3ad2474f500857b5 (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=da7111e1a34bd8b85a98ed1ebc14f65c499748be commit da7111e1a34bd8b85a98ed1ebc14f65c499748be Merge: ff88df4 f325ae1 Author: Brad King AuthorDate: Fri Aug 26 09:45:28 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 26 09:45:28 2016 -0400 Merge topic 'vs-resource-pri-dir' f325ae18 VS: Use target-specific directory for `resources.pri` --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 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.6.1-1489-g82e6501
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 82e65010ed8cbc807604fc618baa7fc176613a8b (commit)
via 426f97d35300555fc5360698b6a6f0da2ba18169 (commit)
from c3bcd014a7452256dcbf738d753944a8d7ed3d78 (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=82e65010ed8cbc807604fc618baa7fc176613a8b
commit 82e65010ed8cbc807604fc618baa7fc176613a8b
Merge: c3bcd01 426f97d
Author: Brad King
AuthorDate: Fri Aug 26 09:42:10 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 09:42:10 2016 -0400
Merge topic 'cpack-rpm-debuginfo-pkg' into next
426f97d3 CPack/RPM: Add test for debuginfo package generation
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=426f97d35300555fc5360698b6a6f0da2ba18169
commit 426f97d35300555fc5360698b6a6f0da2ba18169
Author: Domen Vrankar
AuthorDate: Thu Aug 25 18:35:42 2016 +0200
Commit: Brad King
CommitDate: Fri Aug 26 09:40:37 2016 -0400
CPack/RPM: Add test for debuginfo package generation
diff --git a/Help/release/dev/cpack-rpm-debuginfo-pkg.rst
b/Help/release/dev/cpack-rpm-debuginfo-pkg.rst
new file mode 100644
index 000..8b37fe4
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-debuginfo-pkg.rst
@@ -0,0 +1,6 @@
+cpack-rpm-debuginfo-pkg
+---
+
+* The :module:`CPackRPM` module learned to generate debuginfo
+ packages on demand. See :variable:`CPACK_RPM_DEBUGINFO_PACKAGE`
+ and its per component version.
diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
new file mode 100644
index 000..2a65b7f
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -0,0 +1,26 @@
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
+set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+set(CMAKE_BUILD_TYPE Debug)
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
+"int test_lib();\n")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
+"#include \"test_lib.hpp\"\nint test_lib() {return 0;}\n")
+add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
+"#include \"test_lib.hpp\"\nint main() {return test_lib();}\n")
+add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
+target_link_libraries(test_prog test_lib)
+
+install(TARGETS test_prog DESTINATION foo COMPONENT applications)
+install(FILES CMakeLists.txt DESTINATION bar COMPONENT headers)
+install(TARGETS test_lib DESTINATION bas COMPONENT libs)
+
+set(CPACK_RPM_APPLICATIONS_FILE_NAME "RPM-DEFAULT")
+set(CPACK_RPM_APPLICATIONS_DEBUGINFO_PACKAGE ON)
+set(CPACK_RPM_LIBS_DEBUGINFO_PACKAGE ON)
+
+set(CPACK_PACKAGE_NAME "debuginfo")
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
new file mode 100644
index 000..265ca92
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-ExpectedFiles.cmake
@@ -0,0 +1,14 @@
+set(whitespaces_ "[\t\n\r ]*")
+
+set(EXPECTED_FILES_COUNT "5")
+set(EXPECTED_FILE_1 "debuginfo-applications-0*.rpm")
+set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/test_prog$")
+set(EXPECTED_FILE_2 "debuginfo*-headers.rpm")
+set(EXPECTED_FILE_CONTENT_2 "^/usr/bar${whitespaces_}/usr/bar/CMakeLists.txt$")
+set(EXPECTED_FILE_3 "debuginfo*-libs.rpm")
+set(EXPECTED_FILE_CONTENT_3 "^/usr/bas${whitespaces_}/usr/bas/libtest_lib.so$")
+
+set(EXPECTED_FILE_4 "debuginfo-applications-debuginfo*.rpm")
+set(EXPECTED_FILE_CONTENT_4 ".*")
+set(EXPECTED_FILE_5 "debuginfo-libs-debuginfo*.rpm")
+set(EXPECTED_FILE_CONTENT_5 ".*")
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
new file mode 100644
index 000..557ef3d
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-stderr.txt
@@ -0,0 +1,3 @@
+^CPackRPM: Will use GENERATED spec file:
.*/Tests/RunCMake/RPM/CPack/DEBUGINFO-build/_CPack_Packages/.*/RPM/SPECS/debuginfo-applications.spec
+CPackRPM: Will use GENERATED spec file:
.*/Tests/RunCMake/RPM/CPack/DEBUGINFO-build/_CPack_Packages/.*/RPM/SPECS/debuginfo-headers.spec
+CPackRPM: Will use GENERATED spec file:
.*/Tests/RunCMake/RPM/CPack/DEBUGINFO-build/_CPack_Packages/.*/RPM/SPECS/debuginfo-libs.spec$
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 59c52f8..44586d7 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -16,3 +16,4 @@ run_cpack_test(RPM_DIST "RPM" false)
run_cpack_test(INSTALL_SCRIPTS "RPM" false)
run_cpack_test(DEB_GENERATE_SHLIBS "DEB" true)
run_cpack_test(DEB_GENERATE_SHLIBS_LDCONFIG "DEB"
[Cmake-commits] CMake branch, next, updated. v3.6.1-1487-gc3bcd01
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 c3bcd014a7452256dcbf738d753944a8d7ed3d78 (commit)
via 87ff791424b715b1edd31c45b834fddf92a38646 (commit)
via fd22d5bb476eac37896bfc43cdd4bfa4bdd4fae5 (commit)
from 795c4172d8c78c66cf56e1728543967d0f81226c (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=c3bcd014a7452256dcbf738d753944a8d7ed3d78
commit c3bcd014a7452256dcbf738d753944a8d7ed3d78
Merge: 795c417 87ff791
Author: Brad King
AuthorDate: Fri Aug 26 09:21:11 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 09:21:11 2016 -0400
Merge topic 'import-libuv' into next
87ff7914 fixup! libuv: Disable warnings to avoid changing 3rd party code
fd22d5bb libuv: Fix unused variable warning in uv_loop_close
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87ff791424b715b1edd31c45b834fddf92a38646
commit 87ff791424b715b1edd31c45b834fddf92a38646
Author: Brad King
AuthorDate: Fri Aug 26 09:19:38 2016 -0400
Commit: Brad King
CommitDate: Fri Aug 26 09:19:38 2016 -0400
fixup! libuv: Disable warnings to avoid changing 3rd party code
diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index 599f3f7..e25ac82 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -1,11 +1,11 @@
project(libuv C)
# Disable warnings to avoid changing 3rd party code.
-if(CMAKE_CXX_COMPILER_ID MATCHES
+if(CMAKE_C_COMPILER_ID MATCHES
"^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PathScale")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woffall")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
endif()
find_package(Threads)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd22d5bb476eac37896bfc43cdd4bfa4bdd4fae5
commit fd22d5bb476eac37896bfc43cdd4bfa4bdd4fae5
Author: Brad King
AuthorDate: Fri Aug 26 09:16:45 2016 -0400
Commit: Brad King
CommitDate: Fri Aug 26 09:16:45 2016 -0400
libuv: Fix unused variable warning in uv_loop_close
diff --git a/Utilities/cmlibuv/src/uv-common.c
b/Utilities/cmlibuv/src/uv-common.c
index 434a502..46d9546 100644
--- a/Utilities/cmlibuv/src/uv-common.c
+++ b/Utilities/cmlibuv/src/uv-common.c
@@ -613,7 +613,9 @@ uv_loop_t* uv_loop_new(void) {
int uv_loop_close(uv_loop_t* loop) {
QUEUE* q;
uv_handle_t* h;
+#ifndef NDEBUG
void* saved_data;
+#endif
if (!QUEUE_EMPTY(&(loop)->active_reqs))
return UV_EBUSY;
---
Summary of changes:
Utilities/cmlibuv/CMakeLists.txt |8
Utilities/cmlibuv/src/uv-common.c |2 ++
2 files changed, 6 insertions(+), 4 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.6.1-1484-g795c417
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 795c4172d8c78c66cf56e1728543967d0f81226c (commit) via 86255f8911796de904245682e3b0de2adfa571dc (commit) from 26b134edb36b913f45a63896a2e4c06993cc0779 (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=795c4172d8c78c66cf56e1728543967d0f81226c commit 795c4172d8c78c66cf56e1728543967d0f81226c Merge: 26b134e 86255f8 Author: Brad King AuthorDate: Fri Aug 26 09:15:39 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 26 09:15:39 2016 -0400 Merge topic 'ninja-add_custom_command-depfile' into next 86255f89 fixup! add_custom_command: Add DEPFILE option for Ninja https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86255f8911796de904245682e3b0de2adfa571dc commit 86255f8911796de904245682e3b0de2adfa571dc Author: Brad King AuthorDate: Fri Aug 26 09:15:16 2016 -0400 Commit: Brad King CommitDate: Fri Aug 26 09:15:16 2016 -0400 fixup! add_custom_command: Add DEPFILE option for Ninja diff --git a/Tests/RunCMake/Make/CustomCommandDepfile-ERROR-stderr.txt b/Tests/RunCMake/Make/CustomCommandDepfile-ERROR-stderr.txt index 733c950..74d62a4 100644 --- a/Tests/RunCMake/Make/CustomCommandDepfile-ERROR-stderr.txt +++ b/Tests/RunCMake/Make/CustomCommandDepfile-ERROR-stderr.txt @@ -1,2 +1,5 @@ ^CMake Error at CustomCommandDepfile-ERROR.cmake:1 \(add_custom_command\): - add_custom_command Option DEPFILE not supported by Unix Makefiles + add_custom_command Option DEPFILE not supported by [^ +]+ +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ --- Summary of changes: Tests/RunCMake/Make/CustomCommandDepfile-ERROR-stderr.txt |5 - 1 file changed, 4 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.1-1482-g26b134e
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 26b134edb36b913f45a63896a2e4c06993cc0779 (commit)
via f0a0e4559c17020101e3e0be18bac54e27a263cb (commit)
from 7a7da5c4909f2836bbc52d86b02ac14a4c8719fa (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=26b134edb36b913f45a63896a2e4c06993cc0779
commit 26b134edb36b913f45a63896a2e4c06993cc0779
Merge: 7a7da5c f0a0e45
Author: Brad King
AuthorDate: Fri Aug 26 09:04:21 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 09:04:21 2016 -0400
Merge topic 'import-libuv' into next
f0a0e455 Do not build libuv on HP-UX
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0a0e4559c17020101e3e0be18bac54e27a263cb
commit f0a0e4559c17020101e3e0be18bac54e27a263cb
Author: Brad King
AuthorDate: Fri Aug 26 09:02:46 2016 -0400
Commit: Brad King
CommitDate: Fri Aug 26 09:03:02 2016 -0400
Do not build libuv on HP-UX
Currently libuv does not support HP-UX.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65876d5..aab8416 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -484,6 +484,9 @@ int main(void) { return 0; }
elseif(CYGWIN)
# libuv does not support Cygwin
set(CMAKE_USE_LIBUV 0)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+ # libuv does not support HP-UX
+ set(CMAKE_USE_LIBUV 0)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
# Disable until it can be ported.
set(CMAKE_USE_LIBUV 0)
---
Summary of changes:
CMakeLists.txt |3 +++
1 file changed, 3 insertions(+)
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.1-1480-g7a7da5c
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 7a7da5c4909f2836bbc52d86b02ac14a4c8719fa (commit)
via a9d5f76bc76295966223211ca15d07e3b91a3387 (commit)
from 7159a29e50c3ce63b70994e6bbc915f38bb09851 (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=7a7da5c4909f2836bbc52d86b02ac14a4c8719fa
commit 7a7da5c4909f2836bbc52d86b02ac14a4c8719fa
Merge: 7159a29 a9d5f76
Author: Brad King
AuthorDate: Fri Aug 26 08:59:56 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 08:59:56 2016 -0400
Merge topic 'import-libuv' into next
a9d5f76b Do not build libuv on SPARC
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9d5f76bc76295966223211ca15d07e3b91a3387
commit a9d5f76bc76295966223211ca15d07e3b91a3387
Author: Brad King
AuthorDate: Fri Aug 26 08:57:40 2016 -0400
Commit: Brad King
CommitDate: Fri Aug 26 08:57:40 2016 -0400
Do not build libuv on SPARC
Some work may be needed to port to SPARC with Solaris and Linux.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9176049..65876d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -484,6 +484,9 @@ int main(void) { return 0; }
elseif(CYGWIN)
# libuv does not support Cygwin
set(CMAKE_USE_LIBUV 0)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+ # Disable until it can be ported.
+ set(CMAKE_USE_LIBUV 0)
endif()
endif()
if(CMAKE_USE_LIBUV)
---
Summary of changes:
CMakeLists.txt |3 +++
1 file changed, 3 insertions(+)
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.1-1478-g7159a29
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 7159a29e50c3ce63b70994e6bbc915f38bb09851 (commit) via 24e7ccb7ef486191ebb9fca916c70e367c41b2fb (commit) from 9a429125465a38a75d23b85f6e1f55a9cb5e83fb (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=7159a29e50c3ce63b70994e6bbc915f38bb09851 commit 7159a29e50c3ce63b70994e6bbc915f38bb09851 Merge: 9a42912 24e7ccb Author: Brad King AuthorDate: Fri Aug 26 08:34:08 2016 -0400 Commit: CMake Topic Stage CommitDate: Fri Aug 26 08:34:08 2016 -0400 Merge topic 'update-curl-script' into next 24e7ccb7 curl: Update script to get curl from new repository https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24e7ccb7ef486191ebb9fca916c70e367c41b2fb commit 24e7ccb7ef486191ebb9fca916c70e367c41b2fb Author: Brad King AuthorDate: Fri Aug 26 08:32:23 2016 -0400 Commit: Brad King CommitDate: Fri Aug 26 08:32:45 2016 -0400 curl: Update script to get curl from new repository Curl is now hosted at https://github.com/curl/curl.git diff --git a/Utilities/Scripts/update-curl.bash b/Utilities/Scripts/update-curl.bash index 0e466cf..590bd44 100755 --- a/Utilities/Scripts/update-curl.bash +++ b/Utilities/Scripts/update-curl.bash @@ -7,7 +7,7 @@ shopt -s dotglob readonly name="curl" readonly ownership="Curl Upstream " readonly subtree="Utilities/cmcurl" -readonly repo="https://github.com/bagder/curl.git"; +readonly repo="https://github.com/curl/curl.git"; readonly tag="curl-7_50_1" readonly shortlog=false readonly paths=" --- Summary of changes: Utilities/Scripts/update-curl.bash |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.1-1476-g9a42912
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 9a429125465a38a75d23b85f6e1f55a9cb5e83fb (commit)
via 8c94b5b004606dc021e153e0a4a824a3d9db6750 (commit)
from 031a9c4558879f4f5b5b4f5122623a78066e4638 (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=9a429125465a38a75d23b85f6e1f55a9cb5e83fb
commit 9a429125465a38a75d23b85f6e1f55a9cb5e83fb
Merge: 031a9c4 8c94b5b
Author: Brad King
AuthorDate: Fri Aug 26 08:34:06 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Aug 26 08:34:06 2016 -0400
Merge topic 'import-libuv' into next
8c94b5b0 Do not build libuv on Cygwin
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c94b5b004606dc021e153e0a4a824a3d9db6750
commit 8c94b5b004606dc021e153e0a4a824a3d9db6750
Author: Brad King
AuthorDate: Fri Aug 26 08:17:42 2016 -0400
Commit: Brad King
CommitDate: Fri Aug 26 08:17:42 2016 -0400
Do not build libuv on Cygwin
Currently libuv does not support Cygwin:
https://github.com/libuv/libuv/issues/832
in part due to lack of pthread APIs:
https://cygwin.com/cygwin-api/std-notimpl.html
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b62f6a5..9176049 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,6 +481,9 @@ int main(void) { return 0; }
if(NOT HAVE_CoreServices_OS_X_10_5)
set(CMAKE_USE_LIBUV 0)
endif()
+elseif(CYGWIN)
+ # libuv does not support Cygwin
+ set(CMAKE_USE_LIBUV 0)
endif()
endif()
if(CMAKE_USE_LIBUV)
---
Summary of changes:
CMakeLists.txt |3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
