[Cmake-commits] CMake branch, next, updated. v3.2.2-2697-g4283712
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 4283712685e5e31ff05db587ea7cfcfdc203f447 (commit)
via 7953867ba46223dfab373ce58cff0a4bc20c3864 (commit)
from 1b28de9174cb01ffc2fea5097208a2210934adde (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=4283712685e5e31ff05db587ea7cfcfdc203f447
commit 4283712685e5e31ff05db587ea7cfcfdc203f447
Merge: 1b28de9 7953867
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 13:47:59 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 13:47:59 2015 -0400
Merge topic 'FindJava-openjdk-8' into next
7953867b FindJava: Fix OpenJDK 8 version detection (#15565)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7953867ba46223dfab373ce58cff0a4bc20c3864
commit 7953867ba46223dfab373ce58cff0a4bc20c3864
Author: Felix Geyer de...@ubuntu.com
AuthorDate: Tue May 12 13:45:43 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 12 13:46:12 2015 -0400
FindJava: Fix OpenJDK 8 version detection (#15565)
The openjdk-8 (8u45-b14-2) package on Debian unstable has extra
text after the version number components. Match this and add it
to the reported version string.
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index bb73853..9e43174 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -137,7 +137,7 @@ if(Java_JAVA_EXECUTABLE)
elseif(var MATCHES java full version
\kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\)
# Kaffe style
set(Java_VERSION_STRING ${CMAKE_MATCH_1})
- elseif(var MATCHES openjdk version \([0-9]+\\.[0-9]+\\.[0-9_]+)\)
+ elseif(var MATCHES openjdk version \([0-9]+\\.[0-9]+\\.[0-9_]+.*)\)
# OpenJDK ver 1.7.x on OpenBSD
set(Java_VERSION_STRING ${CMAKE_MATCH_1})
else()
---
Summary of changes:
Modules/FindJava.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.2.2-2699-g13e8682
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 13e86829073482237617637c644b073a6f3300c5 (commit)
via 69a600d4d9adc582523acf5c83abbb989461 (commit)
from 4283712685e5e31ff05db587ea7cfcfdc203f447 (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=13e86829073482237617637c644b073a6f3300c5
commit 13e86829073482237617637c644b073a6f3300c5
Merge: 4283712 69a600d
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue May 12 17:05:03 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 17:05:03 2015 -0400
Merge topic 'add-iwyu-support' into next
69a600d4 add support for include what you use (iwyu) to CMake/CTest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69a600d4d9adc582523acf5c83abbb989461
commit 69a600d4d9adc582523acf5c83abbb989461
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue May 12 16:37:11 2015 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue May 12 16:37:11 2015 -0400
add support for include what you use (iwyu) to CMake/CTest.
This commit adds a cmake -E command to run iwyu in place of a compiler
for the compile line, then it then runs the compiler. This is inserted
into the COMPILE_CXX_OBJECT command if CMAKE_IWYU_EXECUTABLE is set
in the project. This allows for a complete build to be done since iwyu
can not actually build files. The output from iwyu is treated as a warning
by ctest and will show up nicely on CDash when ctest launchers are used.
diff --git a/Modules/CMakeCXXInformation.cmake
b/Modules/CMakeCXXInformation.cmake
index 72b2857..c186eeb 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -280,6 +280,14 @@ if(NOT CMAKE_CXX_COMPILE_OBJECT)
set(CMAKE_CXX_COMPILE_OBJECT
CMAKE_CXX_COMPILER DEFINES FLAGS -o OBJECT -c SOURCE)
endif()
+# check to see if CMAKE_IWYU_EXECUTABLE is set. If yes,
+# then use the cmake -E __run_iwyu command to run iwyu
+# as well as the clang compiler for building cxx files.
+if(CMAKE_IWYU_EXECUTABLE)
+ set(CMAKE_CXX_COMPILE_OBJECT
+CMAKE_COMMAND -E __run_iwyu --iwyu=${CMAKE_IWYU_EXECUTABLE} --
${CMAKE_CXX_COMPILE_OBJECT})
+endif()
+
if(NOT CMAKE_CXX_LINK_EXECUTABLE)
set(CMAKE_CXX_LINK_EXECUTABLE
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 29e07ef..98dfcfa 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -133,6 +133,8 @@ static const char* cmCTestWarningMatches[] = {
cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*,
^CMake Warning.*:,
^\\[WARNING\\],
+ .*should remove these lines:,
+ .*should add these lines:,
0
};
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index de6ecde..bf271e9 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -649,7 +649,9 @@ void cmCTestLaunch::LoadScrapeRules()
this-RegexWarning.push_back((^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]);
this-RegexWarning.push_back((^|[ :])[Rr][Ee][Mm][Aa][Rr][Kk]);
this-RegexWarning.push_back((^|[ :])[Nn][Oo][Tt][Ee]);
-
+ // add warning expressions for include-what-you-use output
+ this-RegexWarning.push_back(.*should remove these lines:);
+ this-RegexWarning.push_back(.*should add these lines:);
// Load custom match rules given to us by CTest.
this-LoadScrapeRules(Warning, this-RegexWarning);
this-LoadScrapeRules(WarningSuppress, this-RegexWarningSuppress);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 12bb8ee..79177fb 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -210,6 +210,57 @@ int cmcmd::ExecuteCMakeCommand(std::vectorstd::string
args)
}
return 0;
}
+// run include what you use command and then run the compile
+// command. This is an internal undocumented option and should
+// only be used by CMake itself when running iwyu.
+else if (args[1] == __run_iwyu)
+ {
+ if(args.size() 3)
+{
+std::cerr __run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]
+ -- compile command\n;
+return 1;
+}
+ bool doing_options = true;
+ std::vectorstd::string orig_cmd;
+ std::string cmd;
+ for (std::string::size_type cc = 2; cc args.size(); cc ++)
+{
+std::string const arg = args[cc];
+if(arg == --)
+ {
+ doing_options = false;
+ }
+else if (doing_options cmHasLiteralPrefix(arg, --iwyu=))
+ {
+ cmd = arg.substr(7);
+
[Cmake-commits] CMake branch, next, updated. v3.2.2-2667-gaf88f06
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 af88f0632a1efcc421562859580e3589cd36011c (commit) via cfb2eca185fd2523a8889484abc9859f33b1eb51 (commit) from 27d3244480a208f7939a0d88e746cafe76397d58 (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=af88f0632a1efcc421562859580e3589cd36011c commit af88f0632a1efcc421562859580e3589cd36011c Merge: 27d3244 cfb2eca Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 08:56:27 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 08:56:27 2015 -0400 Merge topic 'cpack-not-running-tests' into next cfb2eca1 fixup! CPack DEB and RPM tests not running http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb2eca185fd2523a8889484abc9859f33b1eb51 commit cfb2eca185fd2523a8889484abc9859f33b1eb51 Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 08:56:12 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue May 12 08:56:12 2015 -0400 fixup! CPack DEB and RPM tests not running diff --git a/Tests/CPackComponentsPrefix/CMakeLists.txt b/Tests/CPackComponentsPrefix/CMakeLists.txt index 770f825..581d3b3 100644 --- a/Tests/CPackComponentsPrefix/CMakeLists.txt +++ b/Tests/CPackComponentsPrefix/CMakeLists.txt @@ -6,7 +6,7 @@ install(FILES file-runtime.txt install(FILES file-development.txt DESTINATION lib COMPONENT Development) -set(CPACK_PACKAGE_CONTACT None) # mandatore for debian package generator +set(CPACK_PACKAGE_CONTACT None) # mandatory for DEB generator set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 1) set(CPACK_COMPONENTS_ALL Development) set(CPACK_ARCHIVE_COMPONENT_INSTALL 1) --- Summary of changes: Tests/CPackComponentsPrefix/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
[Cmake-commits] CMake branch, next, updated. v3.2.2-2671-gbf646a1
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 bf646a167e3ce90f869494ba74413deaaa457026 (commit) via 1237d5fa8c721f629f0cc44a389703539c5687aa (commit) from cf743f5f8b1aa3403410ffe0d9fe16e75fc18014 (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=bf646a167e3ce90f869494ba74413deaaa457026 commit bf646a167e3ce90f869494ba74413deaaa457026 Merge: cf743f5 1237d5f Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:05:39 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:05:39 2015 -0400 Merge topic 'cpack-deb-component-dependencies' into next 1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1237d5fa8c721f629f0cc44a389703539c5687aa commit 1237d5fa8c721f629f0cc44a389703539c5687aa Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:05:17 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue May 12 09:05:17 2015 -0400 Help: Add notes for topic 'cpack-deb-component-dependencies' diff --git a/Help/release/dev/cpack-deb-component-dependencies.rst b/Help/release/dev/cpack-deb-component-dependencies.rst new file mode 100644 index 000..de9f457 --- /dev/null +++ b/Help/release/dev/cpack-deb-component-dependencies.rst @@ -0,0 +1,6 @@ +cpack-deb-component-dependencies + + +* The :module:`CPackDeb` module learned a new + :variable:`CPACK_DEBIAN_COMPONENT_PACKAGE_DEPENDS` + option to specify per-component dependencies. --- Summary of changes: Help/release/dev/cpack-deb-component-dependencies.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/cpack-deb-component-dependencies.rst 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.2.2-2675-g9cdd1cc
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 9cdd1cc2bbf8bec3062b52eaf86cc52ff5f7ad2a (commit) via 226df303f955a8756cda7544f58242b52ea7ec2e (commit) via 28e7a135e001afb36a7cff8e896ebac75390dde0 (commit) via 231601b696d79075b9c0fe346a8b336f291f6829 (commit) from bf646a167e3ce90f869494ba74413deaaa457026 (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=9cdd1cc2bbf8bec3062b52eaf86cc52ff5f7ad2a commit 9cdd1cc2bbf8bec3062b52eaf86cc52ff5f7ad2a Merge: bf646a1 226df30 Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:10:19 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:10:19 2015 -0400 Merge topic 'ctest-no-make-i' into next 226df303 CTest: Stop telling 'make' to ignore errors with -i 28e7a135 Help: Fix build_command alternative signature docs 231601b6 build_command: Choose configuration consistently across signatures http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=226df303f955a8756cda7544f58242b52ea7ec2e commit 226df303f955a8756cda7544f58242b52ea7ec2e Author: Brad King brad.k...@kitware.com AuthorDate: Fri May 8 15:41:08 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue May 12 09:06:49 2015 -0400 CTest: Stop telling 'make' to ignore errors with -i Add policy CMP0061 to maintain compatibility for existing projects. diff --git a/Help/command/build_command.rst b/Help/command/build_command.rst index fa971e4..1298c1f 100644 --- a/Help/command/build_command.rst +++ b/Help/command/build_command.rst @@ -19,7 +19,8 @@ Sets the given ``variable`` to a command-line string of the form:: where ``cmake`` is the location of the :manual:`cmake(1)` command-line tool, and ``config`` and ``target`` are the values provided to the ``CONFIGURATION`` and ``TARGET`` options, if any. The trailing ``-- -i`` -option is added for Makefile generators. +option is added for :ref:`Makefile Generators` if policy :policy:`CMP0061` +is not set to ``NEW``. When invoked, this ``cmake --build`` command line will launch the underlying build system tool. diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index aff696d..e59cce7 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -118,3 +118,4 @@ All Policies /policy/CMP0058 /policy/CMP0059 /policy/CMP0060 + /policy/CMP0061 diff --git a/Help/policy/CMP0061.rst b/Help/policy/CMP0061.rst new file mode 100644 index 000..069a1ab --- /dev/null +++ b/Help/policy/CMP0061.rst @@ -0,0 +1,24 @@ +CMP0061 +--- + +CTest does not by default tell ``make`` to ignore errors (``-i``). + +The :command:`ctest_build` and :command:`build_command` commands no +longer generate build commands for :ref:`Makefile Generators` with +the ``-i`` option. Previously this was done to help build as much +of tested projects as possible. However, this behavior is not +consistent with other generators and also causes the return code +of the ``make`` tool to be meaningless. + +Of course users may still add this option manually by setting +:variable:`CTEST_BUILD_COMMAND` or the ``MAKECOMMAND`` cache entry. +See the :ref:`CTest Build Step` ``MakeCommand`` setting documentation +for their effects. + +The ``OLD`` behavior for this policy is to add ``-i`` to ``make`` +calls in CTest. The ``NEW`` behavior for this policy is to not +add ``-i``. + +This policy was introduced in CMake version 3.3. Unlike most policies, +CMake version |release| does *not* warn when this policy is not set and +simply uses OLD behavior. diff --git a/Help/release/dev/ctest-no-make-i.rst b/Help/release/dev/ctest-no-make-i.rst new file mode 100644 index 000..96da0bd --- /dev/null +++ b/Help/release/dev/ctest-no-make-i.rst @@ -0,0 +1,7 @@ +ctest-no-make-i +--- + +* The :command:`ctest_build` and :command:`build_command` commands + no longer tell ``make`` tools to ignore errors with the ``-i`` option. + Previously this was done for :ref:`Makefile Generators` but not others. + See policy :policy:`CMP0061`. diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 2b36b0a..27e22c4 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -141,7 +141,8 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler() = this-GlobalGenerator- GenerateCMakeBuildCommand(cmakeBuildTarget ? cmakeBuildTarget : , cmakeBuildConfiguration, - cmakeBuildAdditionalFlags ? cmakeBuildAdditionalFlags : ,
[Cmake-commits] CMake branch, next, updated. v3.2.2-2669-gcf743f5
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 cf743f5f8b1aa3403410ffe0d9fe16e75fc18014 (commit)
via 7c103be8deb906a2c6036da6f25dd30928cc1a54 (commit)
from af88f0632a1efcc421562859580e3589cd36011c (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=cf743f5f8b1aa3403410ffe0d9fe16e75fc18014
commit cf743f5f8b1aa3403410ffe0d9fe16e75fc18014
Merge: af88f06 7c103be
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 08:59:07 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 08:59:07 2015 -0400
Merge topic 'cpack-not-running-tests' into next
7c103be8 CPack: Enable DEB and RPM tests more reliably
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c103be8deb906a2c6036da6f25dd30928cc1a54
commit 7c103be8deb906a2c6036da6f25dd30928cc1a54
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Sat May 9 00:42:30 2015 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 12 08:56:34 2015 -0400
CPack: Enable DEB and RPM tests more reliably
CPack DEB and RPM generators were not used for some tests because
CPACK_BINARY_DEB and CPACK_BINARY_RPM variable were not set. Fix this,
simplify generator selection in CTEST_RUN_CPackComponentsForAll, and fix
bugs that were detected after tests were run.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index e672e72..cb77fb8 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1197,18 +1197,17 @@ function(cpack_rpm_generate_package)
set(CPACK_RPM_COMPRESSION_TYPE_TMP )
endif()
- if(CPACK_PACKAGE_RELOCATABLE)
-set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
- endif()
- if(CPACK_RPM_PACKAGE_RELOCATABLE)
+ if(CPACK_PACKAGE_RELOCATABLE OR CPACK_RPM_PACKAGE_RELOCATABLE)
if(CPACK_RPM_PACKAGE_DEBUG)
message(CPackRPM:Debug: Trying to build a relocatable package)
endif()
if(CPACK_SET_DESTDIR AND (NOT CPACK_SET_DESTDIR STREQUAL I_ON))
message(CPackRPM:Warning: CPACK_SET_DESTDIR is set
(=${CPACK_SET_DESTDIR}) while requesting a relocatable package
(CPACK_RPM_PACKAGE_RELOCATABLE is set): this is not supported, the package
won't be relocatable.)
+ set(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
else()
set(CPACK_RPM_PACKAGE_PREFIX ${CPACK_PACKAGING_INSTALL_PREFIX}) # kept
for back compatibility (provided external RPM spec files)
cpack_rpm_prepare_relocation_paths()
+ set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
endif()
endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 58feefd..f890e56 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -112,6 +112,22 @@ if(BUILD_TESTING)
set(RPMBUILD_EXECUTABLE RPMBUILD_EXECUTABLE-NOTFOUND)
endif()
+ if(RPMBUILD_EXECUTABLE)
+set(CPACK_BINARY_RPM ON)
+ else()
+set(CPACK_BINARY_RPM OFF)
+ endif()
+
+ # Look for rpmbuild to use for tests.
+ # The tool does not work with spaces in the path.
+ find_program(DPKG_EXECUTABLE NAMES dpkg)
+
+ if(DPKG_EXECUTABLE)
+set(CPACK_BINARY_DEB ON)
+ else()
+set(CPACK_BINARY_DEB OFF)
+ endif()
+
#---
# Add tests below here.
@@ -865,11 +881,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
set(CTEST_RUN_CPackComponentsForAll ${CTEST_TEST_CPACK})
set(CTEST_RUN_CPackComponentsPrefix ${CTEST_TEST_CPACK})
- # Do not try to build RPM
- if (NOT RPMBUILD_EXECUTABLE)
-set(CPACK_BINARY_RPM OFF)
- endif()
-
find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
DOC makensis program location
@@ -948,13 +959,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
if(CTEST_RUN_CPackComponentsForAll)
# Check whether if rpmbuild command is found
# before adding RPM tests
-if(RPMBUILD_EXECUTABLE)
+if(CPACK_BINARY_RPM)
list(APPEND ACTIVE_CPACK_GENERATORS RPM)
endif()
# Check whether if dpkg command is found
# before adding DEB tests
-find_program(DPKG_EXECUTABLE NAMES dpkg)
-if(DPKG_EXECUTABLE)
+if(CPACK_BINARY_DEB)
list(APPEND ACTIVE_CPACK_GENERATORS DEB)
endif()
@@ -962,17 +972,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
# now contains the list of 'active generators'
set(CPackComponentsForAll_BUILD_OPTIONS)
# set up list of CPack generators
-list(APPEND GENLST ZIP)
+list(APPEND ACTIVE_CPACK_GENERATORS ZIP)
if(APPLE)
[Cmake-commits] CMake branch, master, updated. v3.2.2-1117-ga6a9710
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 a6a9710fca291a96d01d848bd1aee8233beacf6b (commit) from 53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7 (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=a6a9710fca291a96d01d848bd1aee8233beacf6b commit a6a9710fca291a96d01d848bd1aee8233beacf6b Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed May 13 00:01:06 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed May 13 00:01:06 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index cf7a523..16114a5 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 2) -set(CMake_VERSION_PATCH 20150512) +set(CMake_VERSION_PATCH 20150513) #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, master, updated. v3.2.2-1102-g733ca51
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 733ca510a636aeadd84df761bb3844c473f71ab0 (commit) via f39d26caa77525ee12b8f5fcb4932ebb642c970f (commit) from 55fe56444f134e676a0b9a54d72dbdb85b573a49 (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=733ca510a636aeadd84df761bb3844c473f71ab0 commit 733ca510a636aeadd84df761bb3844c473f71ab0 Merge: 55fe564 f39d26c Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:12:46 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:12:46 2015 -0400 Merge topic 'doc-file-COPY-preserves-structure' f39d26ca Help: Clarify file(COPY) directory semantics (#15561) --- Summary of changes: Help/command/file.rst |6 +- 1 file 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, master, updated. v3.2.2-1098-gcca3bbd
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 cca3bbde98de7954ebd3bca1966c92d931fe0dab (commit) via cf8ce7a39e425aa5ea6a4847f512b8e8628af61a (commit) via ca658a456f80febe05e57bfae8448c8646960ddf (commit) from 0f2658f62d949137c9b0b9081d1a93e5f39d2bb2 (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=cca3bbde98de7954ebd3bca1966c92d931fe0dab commit cca3bbde98de7954ebd3bca1966c92d931fe0dab Merge: 0f2658f cf8ce7a Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:12:41 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:12:41 2015 -0400 Merge topic 'ninja-gcc-windows' cf8ce7a3 RC: Do not override MinGW Makefiles generator preference ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439) --- Summary of changes: Modules/Platform/Windows-GNU.cmake |2 +- Source/cmNinjaNormalTargetGenerator.cxx |2 +- 2 files 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, master, updated. v3.2.2-1100-g55fe564
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 55fe56444f134e676a0b9a54d72dbdb85b573a49 (commit)
via dcb188363d5faba80664c17e9a4713bbd5c0b372 (commit)
from cca3bbde98de7954ebd3bca1966c92d931fe0dab (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=55fe56444f134e676a0b9a54d72dbdb85b573a49
commit 55fe56444f134e676a0b9a54d72dbdb85b573a49
Merge: cca3bbd dcb1883
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 09:12:43 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 09:12:43 2015 -0400
Merge topic 'ExternalProject-improve-missing-source-error'
dcb18836 ExternalProject: Improve error when SOURCE_DIR is missing (#15560)
---
Summary of changes:
Modules/ExternalProject.cmake| 13 -
.../NoOptions-result.txt}|0
Tests/RunCMake/ExternalProject/NoOptions-stderr.txt | 18 ++
Tests/RunCMake/ExternalProject/NoOptions.cmake |2 ++
Tests/RunCMake/ExternalProject/RunCMakeTest.cmake|3 +++
.../SourceEmpty-result.txt} |0
.../RunCMake/ExternalProject/SourceEmpty-stderr.txt | 18 ++
Tests/RunCMake/ExternalProject/SourceEmpty.cmake |5 +
.../SourceMissing-result.txt}|0
.../ExternalProject/SourceMissing-stderr.txt | 18 ++
Tests/RunCMake/ExternalProject/SourceMissing.cmake |2 ++
11 files changed, 78 insertions(+), 1 deletion(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
ExternalProject/NoOptions-result.txt} (100%)
create mode 100644 Tests/RunCMake/ExternalProject/NoOptions-stderr.txt
create mode 100644 Tests/RunCMake/ExternalProject/NoOptions.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
ExternalProject/SourceEmpty-result.txt} (100%)
create mode 100644 Tests/RunCMake/ExternalProject/SourceEmpty-stderr.txt
create mode 100644 Tests/RunCMake/ExternalProject/SourceEmpty.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
ExternalProject/SourceMissing-result.txt} (100%)
create mode 100644 Tests/RunCMake/ExternalProject/SourceMissing-stderr.txt
create mode 100644 Tests/RunCMake/ExternalProject/SourceMissing.cmake
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.2.2-1095-g0f2658f
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 0f2658f62d949137c9b0b9081d1a93e5f39d2bb2 (commit) via a190493414c04804bacce1ce627448440b07b63d (commit) via e228d66d60ca8c7609d56fb135b2e68f686d34af (commit) from df95367d7e656608cdeca5c5cdaad79195cd465a (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=0f2658f62d949137c9b0b9081d1a93e5f39d2bb2 commit 0f2658f62d949137c9b0b9081d1a93e5f39d2bb2 Merge: df95367 a190493 Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:12:40 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:12:40 2015 -0400 Merge topic 'suppress-LNK4089-warning' a1904934 CTestCustom: Suppress LNK4089 warning about RPCRT4 e228d66d CTestCustom: Suppress LNK4089 warning about ole32 --- Summary of changes: CTestCustom.cmake.in |2 ++ 1 file changed, 2 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.2.2-2693-gaa546d6
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 aa546d6efa4af4d61fd216f2cb5acc6e0ab6ea95 (commit) via 947cd7ebde863c9fdb1c55f7dcf8e07d489b739e (commit) from 4951e2a3a8edc6af8080bf31978acef9f06e0e4a (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=aa546d6efa4af4d61fd216f2cb5acc6e0ab6ea95 commit aa546d6efa4af4d61fd216f2cb5acc6e0ab6ea95 Merge: 4951e2a 947cd7e Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 10:04:05 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 10:04:05 2015 -0400 Merge topic 'FindHDF5-version-support' into next 947cd7eb fixup! FindHDF5: Add version support http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947cd7ebde863c9fdb1c55f7dcf8e07d489b739e commit 947cd7ebde863c9fdb1c55f7dcf8e07d489b739e Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 10:03:55 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue May 12 10:03:55 2015 -0400 fixup! FindHDF5: Add version support diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 2a92f5c..b4f4399 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -60,8 +60,8 @@ # HDF5_DIFF_EXECUTABLE - the path to the HDF5 dataset comparison tool #= +# Copyright 2015 Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf # Copyright 2009 Kitware, Inc. -# 2015 Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf # # Distributed under the OSI-approved BSD License (the License); # see accompanying file Copyright.txt for details. --- Summary of changes: Modules/FindHDF5.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, master, updated. v3.2.2-1104-g16d8411
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 16d84111da20da59a2eadb673e1bb74eb3a73706 (commit) via 3307e10fc4ef5ffb551df35bc0978a2543305e9d (commit) from 733ca510a636aeadd84df761bb3844c473f71ab0 (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=16d84111da20da59a2eadb673e1bb74eb3a73706 commit 16d84111da20da59a2eadb673e1bb74eb3a73706 Merge: 733ca51 3307e10 Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:12:48 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:12:48 2015 -0400 Merge topic 'detect-c++14-missing-gets' 3307e10f Avoid using C++14 to build CMake if cstdio breaks --- Summary of changes: CMakeLists.txt |7 - Source/Checks/cm_cxx14_cstdio.cmake| 33 .../dummy.c = Source/Checks/cm_cxx14_cstdio.cpp |1 + 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Source/Checks/cm_cxx14_cstdio.cmake copy Tests/FindPackageTest/Exporter/dummy.c = Source/Checks/cm_cxx14_cstdio.cpp (58%) 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.2.2-2689-g5ccac64
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 5ccac647e88eb5dabd10dd3a2bed3a3a5fd5b21e (commit) via 53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7 (commit) via 70d48e1287c8e91c4815573485c8acba0879df89 (commit) via a5bab6e1a4e55637dbde3f1a526b87e06c715283 (commit) via ffd5d0922576ff1acd72c1498a6b59ce94194be7 (commit) via 16d84111da20da59a2eadb673e1bb74eb3a73706 (commit) via 733ca510a636aeadd84df761bb3844c473f71ab0 (commit) via 55fe56444f134e676a0b9a54d72dbdb85b573a49 (commit) via cca3bbde98de7954ebd3bca1966c92d931fe0dab (commit) via 0f2658f62d949137c9b0b9081d1a93e5f39d2bb2 (commit) via df95367d7e656608cdeca5c5cdaad79195cd465a (commit) via df0aa37a67e05008ac7ec175b14a0f3eaa78067e (commit) via ee3973e72a7e9775848fe806492c6e3a2feb8f47 (commit) via c6a805d1926ed73e94013c11c8556fc35d2bc35c (commit) from 9cdd1cc2bbf8bec3062b52eaf86cc52ff5f7ad2a (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=5ccac647e88eb5dabd10dd3a2bed3a3a5fd5b21e commit 5ccac647e88eb5dabd10dd3a2bed3a3a5fd5b21e Merge: 9cdd1cc 53bb51f Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:15:26 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue May 12 09:15:26 2015 -0400 Merge branch 'master' into next --- 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.2.2-2691-g4951e2a
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 4951e2a3a8edc6af8080bf31978acef9f06e0e4a (commit)
via c11507340c4ad35367634868734beef320422ec9 (commit)
from 5ccac647e88eb5dabd10dd3a2bed3a3a5fd5b21e (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=4951e2a3a8edc6af8080bf31978acef9f06e0e4a
commit 4951e2a3a8edc6af8080bf31978acef9f06e0e4a
Merge: 5ccac64 c115073
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 09:57:58 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 09:57:58 2015 -0400
Merge topic 'FindHDF5-version-support' into next
c1150734 FindHDF5: Add version support
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c11507340c4ad35367634868734beef320422ec9
commit c11507340c4ad35367634868734beef320422ec9
Author: Axel Huebl a.hu...@hzdr.de
AuthorDate: Mon May 11 15:22:28 2015 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 12 09:57:27 2015 -0400
FindHDF5: Add version support
Detect the HDF5 version and set HDF5_VERSION just as we
detect HDF5_IS_PARALLEL from the header already.
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 0d58e13..2a92f5c 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -51,6 +51,7 @@
# bindings.
# HDF5_LIBRARIES - Required libraries for all requested bindings
# HDF5_FOUND - true if HDF5 was found on the system
+# HDF5_VERSION - HDF5 version in format Major.Minor.Release
# HDF5_LIBRARY_DIRS - the full set of library directories
# HDF5_IS_PARALLEL - Whether or not HDF5 was found with parallel IO support
# HDF5_C_COMPILER_EXECUTABLE - the path to the HDF5 C wrapper compiler
@@ -60,6 +61,7 @@
#=
# Copyright 2009 Kitware, Inc.
+# 2015 Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
#
# Distributed under the OSI-approved BSD License (the License);
# see accompanying file Copyright.txt for details.
@@ -335,6 +337,7 @@ if( NOT HDF5_FOUND )
# If the HDF5 include directory was found, open H5pubconf.h to determine if
# HDF5 was compiled with parallel IO support
set( HDF5_IS_PARALLEL FALSE )
+set( HDF5_VERSION )
foreach( _dir IN LISTS HDF5_INCLUDE_DIRS )
if( EXISTS ${_dir}/H5pubconf.h )
file( STRINGS ${_dir}/H5pubconf.h
@@ -343,6 +346,16 @@ if( NOT HDF5_FOUND )
if( HDF5_HAVE_PARALLEL_DEFINE )
set( HDF5_IS_PARALLEL TRUE )
endif()
+unset(HDF5_HAVE_PARALLEL_DEFINE)
+
+file( STRINGS ${_dir}/H5pubconf.h
+HDF5_VERSION_DEFINE
+REGEX ^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+ )
+if( ${HDF5_VERSION_DEFINE} MATCHES
+H5_VERSION[ \t]+\([0-9]+\\.[0-9]+\\.[0-9]+).*\ )
+set( HDF5_VERSION ${CMAKE_MATCH_1} )
+endif()
+unset(HDF5_VERSION_DEFINE)
endif()
endforeach()
set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
@@ -357,8 +370,8 @@ if( NOT HDF5_FOUND )
endif()
-find_package_handle_standard_args( HDF5 DEFAULT_MSG
-HDF5_LIBRARIES
-HDF5_INCLUDE_DIRS
+find_package_handle_standard_args( HDF5
+REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS
+VERSION_VAR HDF5_VERSION
)
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 15493be..bdc2563 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -86,8 +86,8 @@ foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE
GETTEXT GIT HG
check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
endforeach()
-foreach(VTEST BISON Boost CUDA DOXYGEN FLEX GIF GTK2 LibArchive OPENSCENEGRAPH
-RUBY SWIG)
+foreach(VTEST BISON Boost CUDA DOXYGEN FLEX GIF GTK2
+HDF5 LibArchive OPENSCENEGRAPH RUBY SWIG)
check_version_string(${VTEST} ${VTEST}_VERSION)
endforeach()
---
Summary of changes:
Modules/FindHDF5.cmake| 19 ---
Tests/CMakeOnly/AllFindModules/CMakeLists.txt |4 ++--
2 files changed, 18 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, master, updated. v3.2.2-1112-g70d48e1
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 70d48e1287c8e91c4815573485c8acba0879df89 (commit)
via 1237d5fa8c721f629f0cc44a389703539c5687aa (commit)
via e3f522f6e44d459247fa3dbc3cde65867c148f76 (commit)
from a5bab6e1a4e55637dbde3f1a526b87e06c715283 (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=70d48e1287c8e91c4815573485c8acba0879df89
commit 70d48e1287c8e91c4815573485c8acba0879df89
Merge: a5bab6e 1237d5f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 09:12:54 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 09:12:54 2015 -0400
Merge topic 'cpack-deb-component-dependencies'
1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies'
e3f522f6 CPack/DEB per component dependencies
---
Summary of changes:
.../dev/cpack-deb-component-dependencies.rst |6 ++
Modules/CPackDeb.cmake | 68 +++-
Tests/CMakeLists.txt |4 +-
... MyLibCPackConfig-components-depend1.cmake.in} |5 ++
... MyLibCPackConfig-components-depend2.cmake.in} | 15 +++--
... RunCPackVerifyResult-components-depend1.cmake} | 22 +++
... RunCPackVerifyResult-components-depend2.cmake} | 44 -
.../CPackComponentsDEB/RunCPackVerifyResult.cmake |1 +
8 files changed, 117 insertions(+), 48 deletions(-)
create mode 100644 Help/release/dev/cpack-deb-component-dependencies.rst
copy
Tests/CPackComponentsDEB/{MyLibCPackConfig-components-lintian-dpkgdeb-checks.cmake.in
= MyLibCPackConfig-components-depend1.cmake.in} (57%)
copy Tests/CPackComponentsDEB/{MyLibCPackConfig-components-shlibdeps1.cmake.in
= MyLibCPackConfig-components-depend2.cmake.in} (52%)
copy
Tests/CPackComponentsDEB/{RunCPackVerifyResult-components-description1.cmake =
RunCPackVerifyResult-components-depend1.cmake} (78%)
copy
Tests/CPackComponentsDEB/{RunCPackVerifyResult-components-description1.cmake =
RunCPackVerifyResult-components-depend2.cmake} (60%)
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.2.2-1116-g53bb51f
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 53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7 (commit)
via 226df303f955a8756cda7544f58242b52ea7ec2e (commit)
via 28e7a135e001afb36a7cff8e896ebac75390dde0 (commit)
via 231601b696d79075b9c0fe346a8b336f291f6829 (commit)
from 70d48e1287c8e91c4815573485c8acba0879df89 (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=53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7
commit 53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7
Merge: 70d48e1 226df30
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 09:12:56 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 09:12:56 2015 -0400
Merge topic 'ctest-no-make-i'
226df303 CTest: Stop telling 'make' to ignore errors with -i
28e7a135 Help: Fix build_command alternative signature docs
231601b6 build_command: Choose configuration consistently across signatures
---
Summary of changes:
Help/command/build_command.rst |5 ++--
Help/manual/cmake-policies.7.rst |1 +
Help/policy/CMP0061.rst| 24
Help/release/dev/ctest-no-make-i.rst |7 ++
Source/CTest/cmCTestBuildCommand.cxx |3 ++-
Source/cmBuildCommand.cxx |8 ---
Source/cmBuildCommand.h|2 ++
Source/cmMakefile.cxx | 20
Source/cmMakefile.h|2 ++
Source/cmPolicies.h|3 +++
.../RunCMake/build_command/CMP0061-NEW-stderr.txt | 10
Tests/RunCMake/build_command/CMP0061-NEW.cmake |2 ++
.../build_command/CMP0061-OLD-make-stderr.txt | 10
.../RunCMake/build_command/CMP0061-OLD-make.cmake |2 ++
.../build_command/CMP0061-OLD-other-stderr.txt | 10
.../RunCMake/build_command/CMP0061-OLD-other.cmake |2 ++
Tests/RunCMake/build_command/CMP0061Common.cmake | 10
Tests/RunCMake/build_command/RunCMakeTest.cmake|8 +++
.../BuildFailure-CMP0061-OLD-result.txt|1 +
.../BuildFailure-CMP0061-OLD-stderr.txt|2 ++
.../BuildFailure-result.txt} |0
Tests/RunCMake/ctest_build/BuildFailure-stderr.txt |2 ++
Tests/RunCMake/ctest_build/CMakeLists.txt.in |1 +
Tests/RunCMake/ctest_build/RunCMakeTest.cmake | 23 +++
Tests/RunCMake/ctest_build/test.cmake.in |4 +++-
25 files changed, 155 insertions(+), 7 deletions(-)
create mode 100644 Help/policy/CMP0061.rst
create mode 100644 Help/release/dev/ctest-no-make-i.rst
create mode 100644 Tests/RunCMake/build_command/CMP0061-NEW-stderr.txt
create mode 100644 Tests/RunCMake/build_command/CMP0061-NEW.cmake
create mode 100644 Tests/RunCMake/build_command/CMP0061-OLD-make-stderr.txt
create mode 100644 Tests/RunCMake/build_command/CMP0061-OLD-make.cmake
create mode 100644 Tests/RunCMake/build_command/CMP0061-OLD-other-stderr.txt
create mode 100644 Tests/RunCMake/build_command/CMP0061-OLD-other.cmake
create mode 100644 Tests/RunCMake/build_command/CMP0061Common.cmake
create mode 100644
Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-result.txt
create mode 100644
Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt
copy Tests/RunCMake/{ctest_memcheck/DummyAddressSanitizer-result.txt =
ctest_build/BuildFailure-result.txt} (100%)
create mode 100644 Tests/RunCMake/ctest_build/BuildFailure-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.2.2-1109-ga5bab6e
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 a5bab6e1a4e55637dbde3f1a526b87e06c715283 (commit) via 7c103be8deb906a2c6036da6f25dd30928cc1a54 (commit) from ffd5d0922576ff1acd72c1498a6b59ce94194be7 (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=a5bab6e1a4e55637dbde3f1a526b87e06c715283 commit a5bab6e1a4e55637dbde3f1a526b87e06c715283 Merge: ffd5d09 7c103be Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:12:52 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:12:52 2015 -0400 Merge topic 'cpack-not-running-tests' 7c103be8 CPack: Enable DEB and RPM tests more reliably --- Summary of changes: Modules/CPackRPM.cmake |7 +++-- Tests/CMakeLists.txt | 40 +++- Tests/CPackComponentsPrefix/CMakeLists.txt |1 + 3 files changed, 25 insertions(+), 23 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.2.2-1107-gffd5d09
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 ffd5d0922576ff1acd72c1498a6b59ce94194be7 (commit) via 1506f9ca56c813f6c1fee4cea90a1cd8e5a4a04d (commit) via 8d484463725edec792c26fdd33547f7ad63c2c14 (commit) from 16d84111da20da59a2eadb673e1bb74eb3a73706 (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=ffd5d0922576ff1acd72c1498a6b59ce94194be7 commit ffd5d0922576ff1acd72c1498a6b59ce94194be7 Merge: 16d8411 1506f9c Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 12 09:12:50 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue May 12 09:12:50 2015 -0400 Merge topic 'find_package-no-cmake-gui-paths' 1506f9ca find_package: Drop search in recent cmake-gui locations 8d484463 FindFLTK: Drop search in recent cmake-gui locations --- Summary of changes: Help/command/find_package.rst | 16 --- .../dev/find_package-no-cmake-gui-paths.rst| 10 +++ Modules/FindFLTK.cmake | 15 -- Modules/FindFLTK2.cmake| 13 - Source/cmFindPackageCommand.cxx| 30 +--- Source/cmFindPackageCommand.h |2 -- 6 files changed, 16 insertions(+), 70 deletions(-) create mode 100644 Help/release/dev/find_package-no-cmake-gui-paths.rst 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.2.2-2695-g1b28de9
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 1b28de9174cb01ffc2fea5097208a2210934adde (commit)
via 58d6709e64d3ae061da2b9db49ce9d884a77e654 (commit)
from aa546d6efa4af4d61fd216f2cb5acc6e0ab6ea95 (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=1b28de9174cb01ffc2fea5097208a2210934adde
commit 1b28de9174cb01ffc2fea5097208a2210934adde
Merge: aa546d6 58d6709
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 12 10:04:45 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 12 10:04:45 2015 -0400
Merge topic 'FindHDF5-version-support' into next
58d6709e FindHDF5: Add version support
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58d6709e64d3ae061da2b9db49ce9d884a77e654
commit 58d6709e64d3ae061da2b9db49ce9d884a77e654
Author: Axel Huebl a.hu...@hzdr.de
AuthorDate: Mon May 11 15:22:28 2015 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 12 10:04:19 2015 -0400
FindHDF5: Add version support
Detect the HDF5 version and set HDF5_VERSION just as we
detect HDF5_IS_PARALLEL from the header already.
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 0d58e13..b4f4399 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -51,6 +51,7 @@
# bindings.
# HDF5_LIBRARIES - Required libraries for all requested bindings
# HDF5_FOUND - true if HDF5 was found on the system
+# HDF5_VERSION - HDF5 version in format Major.Minor.Release
# HDF5_LIBRARY_DIRS - the full set of library directories
# HDF5_IS_PARALLEL - Whether or not HDF5 was found with parallel IO support
# HDF5_C_COMPILER_EXECUTABLE - the path to the HDF5 C wrapper compiler
@@ -59,6 +60,7 @@
# HDF5_DIFF_EXECUTABLE - the path to the HDF5 dataset comparison tool
#=
+# Copyright 2015 Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
# Copyright 2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the License);
@@ -335,6 +337,7 @@ if( NOT HDF5_FOUND )
# If the HDF5 include directory was found, open H5pubconf.h to determine if
# HDF5 was compiled with parallel IO support
set( HDF5_IS_PARALLEL FALSE )
+set( HDF5_VERSION )
foreach( _dir IN LISTS HDF5_INCLUDE_DIRS )
if( EXISTS ${_dir}/H5pubconf.h )
file( STRINGS ${_dir}/H5pubconf.h
@@ -343,6 +346,16 @@ if( NOT HDF5_FOUND )
if( HDF5_HAVE_PARALLEL_DEFINE )
set( HDF5_IS_PARALLEL TRUE )
endif()
+unset(HDF5_HAVE_PARALLEL_DEFINE)
+
+file( STRINGS ${_dir}/H5pubconf.h
+HDF5_VERSION_DEFINE
+REGEX ^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+ )
+if( ${HDF5_VERSION_DEFINE} MATCHES
+H5_VERSION[ \t]+\([0-9]+\\.[0-9]+\\.[0-9]+).*\ )
+set( HDF5_VERSION ${CMAKE_MATCH_1} )
+endif()
+unset(HDF5_VERSION_DEFINE)
endif()
endforeach()
set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
@@ -357,8 +370,8 @@ if( NOT HDF5_FOUND )
endif()
-find_package_handle_standard_args( HDF5 DEFAULT_MSG
-HDF5_LIBRARIES
-HDF5_INCLUDE_DIRS
+find_package_handle_standard_args( HDF5
+REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS
+VERSION_VAR HDF5_VERSION
)
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 15493be..bdc2563 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -86,8 +86,8 @@ foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE
GETTEXT GIT HG
check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
endforeach()
-foreach(VTEST BISON Boost CUDA DOXYGEN FLEX GIF GTK2 LibArchive OPENSCENEGRAPH
-RUBY SWIG)
+foreach(VTEST BISON Boost CUDA DOXYGEN FLEX GIF GTK2
+HDF5 LibArchive OPENSCENEGRAPH RUBY SWIG)
check_version_string(${VTEST} ${VTEST}_VERSION)
endforeach()
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
