[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6027-g138a571
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Wed Dec 4 06:15:43 EST 2013
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 138a571f2f2f33948bdfa9f4acf75e16956d10f7 (commit)
via a7128d7966755bde03598cb1bb0d7e7a85599fce (commit)
via ac1abf67bec0996afdfdab4cd547e378e7ca0822 (commit)
via 720c1a85e576aff8a804a9a17bb5fa29e4f8454f (commit)
via 1f70d2cc91707fe592ffc777fbc3dcdaebf189ef (commit)
from 17bf3bb47188e1df02882be907d296eb081d2923 (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=138a571f2f2f33948bdfa9f4acf75e16956d10f7
commit 138a571f2f2f33948bdfa9f4acf75e16956d10f7
Merge: 17bf3bb a7128d7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Dec 4 06:15:40 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 4 06:15:40 2013 -0500
Merge topic 'ExternalProject-independent-step-targets' into next
a7128d7 Merge topic 'CMakeParseArguments_EmptyArgs' into ExternalProject-independent-step-targets
ac1abf6 ExternalProject: Add unit tests for NO_DEPENDS and INDEPENDENT_STEP_TARGETS
720c1a8 ExternalProject: Fix indentation
1f70d2c ExternalProject Fix INDEPENDENT_STEP_TARGETS option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7128d7966755bde03598cb1bb0d7e7a85599fce
commit a7128d7966755bde03598cb1bb0d7e7a85599fce
Merge: ac1abf6 caf5ba9
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 4 12:14:53 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 4 12:14:53 2013 +0100
Merge topic 'CMakeParseArguments_EmptyArgs' into ExternalProject-independent-step-targets
Conflicts:
Tests/RunCMake/CMakeLists.txt
diff --cc Tests/RunCMake/CMakeLists.txt
index d0aeb76,bb26396..8947d41
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -135,4 -135,4 +135,5 @@@ add_RunCMake_test(File_Generate
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
add_RunCMake_test(CheckModules)
+ add_RunCMake_test(CMakeParseArguments)
+add_RunCMake_test(ExternalProject)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac1abf67bec0996afdfdab4cd547e378e7ca0822
commit ac1abf67bec0996afdfdab4cd547e378e7ca0822
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 4 12:03:20 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 4 12:11:12 2013 +0100
ExternalProject: Add unit tests for NO_DEPENDS and INDEPENDENT_STEP_TARGETS
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 602ff0f..e22d84a 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -21,6 +21,7 @@ set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER
set(base "${CMAKE_BINARY_DIR}/CMakeExternals")
set(binary_base "${base}/Build")
set_property(DIRECTORY PROPERTY EP_BASE ${base})
+set_property(DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS update)
set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
if(NOT DEFINED can_build_tutorial_step5)
@@ -100,7 +101,8 @@ ExternalProject_Add(${proj}
DOWNLOAD_COMMAND ""
INSTALL_COMMAND ""
PATCH_COMMAND ""
- STEP_TARGETS install update
+ INDEPENDENT_STEP_TARGETS update
+ STEP_TARGETS install
SVN_REPOSITORY ""
SVN_REVISION ""
SVN_USERNAME ""
diff --git a/Tests/ExternalProjectUpdate/CMakeLists.txt b/Tests/ExternalProjectUpdate/CMakeLists.txt
index c33e90b..2cffb69 100644
--- a/Tests/ExternalProjectUpdate/CMakeLists.txt
+++ b/Tests/ExternalProjectUpdate/CMakeLists.txt
@@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER
set(base "${CMAKE_BINARY_DIR}/CMakeExternals")
set(binary_base "${base}/Build")
set_property(DIRECTORY PROPERTY EP_BASE ${base})
+set_property(DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS update)
set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
set(do_git_tests 0)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 209b0b3..d0aeb76 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -135,3 +135,4 @@ add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
add_RunCMake_test(CheckModules)
+add_RunCMake_test(ExternalProject)
diff --git a/Tests/RunCMake/ExternalProject/CMakeLists.txt b/Tests/RunCMake/ExternalProject/CMakeLists.txt
new file mode 100644
index 0000000..4b3de84
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt b/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
new file mode 100644
index 0000000..4cb051d
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
@@ -0,0 +1,36 @@
+CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+. \(message\):
+ Using NO_DEPENDS for "configure" step might break parallel builds
+Call Stack \(most recent call first\):
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_Add_StepTargets\)
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_Add_Step\)
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(_ep_add_configure_command\)
+ NO_DEPENDS.cmake:[0-9]+ \(ExternalProject_Add\)
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+. \(message\):
+ Using NO_DEPENDS for "build" step might break parallel builds
+Call Stack \(most recent call first\):
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_Add_StepTargets\)
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_Add_Step\)
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(_ep_add_build_command\)
+ NO_DEPENDS.cmake:[0-9]+ \(ExternalProject_Add\)
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+. \(message\):
+ Using NO_DEPENDS for "install" step might break parallel builds
+Call Stack \(most recent call first\):
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_Add_StepTargets\)
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_Add_Step\)
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(_ep_add_install_command\)
+ NO_DEPENDS.cmake:[0-9]+ \(ExternalProject_Add\)
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+. \(message\):
+ Using NO_DEPENDS for "test" step might break parallel builds
+Call Stack \(most recent call first\):
+ NO_DEPENDS.cmake:[0-9]+ \(ExternalProject_Add_StepTargets\)
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake
new file mode 100644
index 0000000..dfb7268
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+include(ExternalProject RESULT_VARIABLE GOO)
+
+set_property(DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS download patch update configure build)
+
+ExternalProject_Add(FOO
+ GIT_REPOSITORY https://example.org/foo.git)
+
+ExternalProject_Add(BAR
+ GIT_REPOSITORY https://example.org/bar.git
+ TEST_COMMAND echo test
+ INDEPENDENT_STEP_TARGETS install)
+# This one should not give a warning
+ExternalProject_Add_Step(BAR bar
+ COMMAND echo bar)
+
+ExternalProject_Add_StepTargets(BAR NO_DEPENDS test bar)
diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
new file mode 100644
index 0000000..48965ad
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(NO_DEPENDS)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=720c1a85e576aff8a804a9a17bb5fa29e4f8454f
commit 720c1a85e576aff8a804a9a17bb5fa29e4f8454f
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 4 11:50:00 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 4 11:50:00 2013 +0100
ExternalProject: Fix indentation
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7727983..7b40b0e 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1080,7 +1080,7 @@ function(ExternalProject_Add_StepTargets name)
endif()
foreach(step ${steps})
if(no_deps AND "${step}" MATCHES "^(configure|build|install|test)$")
- message(AUTHOR_WARNING "Using NO_DEPENDS for \"${step}\" step might break parallel builds")
+ message(AUTHOR_WARNING "Using NO_DEPENDS for \"${step}\" step might break parallel builds")
endif()
_ep_get_step_stampfile(${name} ${step} stamp_file)
add_custom_target(${name}-${step}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f70d2cc91707fe592ffc777fbc3dcdaebf189ef
commit 1f70d2cc91707fe592ffc777fbc3dcdaebf189ef
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 4 11:48:03 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 4 11:48:20 2013 +0100
ExternalProject Fix INDEPENDENT_STEP_TARGETS option
The part of code that generates the options to be accepted by the EP
functions expects the comment to be on the same line as the option
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 8c21ef0..7727983 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -69,10 +69,9 @@
# [LOG_INSTALL 1] # Wrap install in script to log output
# #--Custom targets-------------
# [STEP_TARGETS st1 st2 ...] # Generate custom targets for these steps
-# [INDEPENDENT_STEP_TARGETS st1 st2 ...]
-# # Generate custom targets for these steps that
-# # do not depend on other external project even
-# # if a dependency is set
+# [INDEPENDENT_STEP_TARGETS st1 st2 ...] # Generate custom targets for these
+# # steps that do not depend on other external
+# # project even if a dependency is set
# )
#
# The ``*_DIR`` options specify directories for the project, with default
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 9 ++---
Tests/ExternalProject/CMakeLists.txt | 4 ++-
Tests/ExternalProjectUpdate/CMakeLists.txt | 1 +
Tests/RunCMake/CMakeLists.txt | 1 +
.../CMakeLists.txt | 0
.../RunCMake/ExternalProject/NO_DEPENDS-stderr.txt | 36 ++++++++++++++++++++
Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake | 18 ++++++++++
Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 3 ++
8 files changed, 66 insertions(+), 6 deletions(-)
copy Tests/RunCMake/{CMakeParseArguments => ExternalProject}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
create mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake
create mode 100644 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list