[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6373-g51c48ea
Brad King
brad.king at kitware.com
Mon Dec 23 10:27:20 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 51c48eae6dd003d7e570bf4bf25582824bda0209 (commit)
via 2a28c60205258b70504ae5a149efe195c5035425 (commit)
from fb3d08984b9e78596b7152f950969b8d06882cc6 (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=51c48eae6dd003d7e570bf4bf25582824bda0209
commit 51c48eae6dd003d7e570bf4bf25582824bda0209
Merge: fb3d089 2a28c60
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 23 10:27:16 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 23 10:27:16 2013 -0500
Merge topic 'ExternalProject-independent-step-targets' into next
2a28c60 Revert topic 'ExternalProject-independent-step-targets'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a28c60205258b70504ae5a149efe195c5035425
commit 2a28c60205258b70504ae5a149efe195c5035425
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 23 10:27:07 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 23 10:27:07 2013 -0500
Revert topic 'ExternalProject-independent-step-targets'
It will be replaced after reworking the approach to testing.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7b40b0e..63f1180 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -69,9 +69,6 @@
# [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
# )
#
# The ``*_DIR`` options specify directories for the project, with default
@@ -151,30 +148,18 @@
# The ``ExternalProject_Add_StepTargets`` function generates custom
# targets for the steps listed::
#
-# ExternalProject_Add_StepTargets(<name> [NO_DEPENDS] [step1 [step2 [...]]])
+# ExternalProject_Add_StepTargets(<name> [step1 [step2 [...]]])
#
-# If ``NO_DEPENDS`` is set, the target will not depend on the
-# dependencies of the complete project. This is usually safe to use for
-# the download, update, and patch steps that do not require that all the
-# dependencies are updated and built. Using ``NO_DEPENDS`` for other
-# of the default steps might break parallel builds, so you should avoid,
-# it. For custom steps, you should consider whether or not the custom
-# commands requires that the dependencies are configured, built and
-# installed.
-#
-# If ``STEP_TARGETS`` or ``INDEPENDENT_STEP_TARGETS`` is set then
-# ``ExternalProject_Add_StepTargets`` is automatically called at the end
-# of matching calls to ``ExternalProject_Add_Step``. Pass
-# ``STEP_TARGETS`` or ``INDEPENDENT_STEP_TARGETS`` explicitly to
+# If ``STEP_TARGETS`` is set then ``ExternalProject_Add_StepTargets`` is
+# automatically called at the end of matching calls to
+# ``ExternalProject_Add_Step``. Pass ``STEP_TARGETS`` explicitly to
# individual ``ExternalProject_Add`` calls, or implicitly to all
-# ``ExternalProject_Add`` calls by setting the directory properties
-# ``EP_STEP_TARGETS`` and ``EP_INDEPENDENT_STEP_TARGETS``. The
-# ``INDEPENDENT`` version of the argument and of the property will call
-# ``ExternalProject_Add_StepTargets`` with the ``NO_DEPENDS`` argument.
+# ``ExternalProject_Add`` calls by setting the directory property
+# ``EP_STEP_TARGETS``.
#
-# If ``STEP_TARGETS`` and ``INDEPENDENT_STEP_TARGETS`` are not set,
-# clients may still manually call ``ExternalProject_Add_StepTargets``
-# after calling ``ExternalProject_Add`` or ``ExternalProject_Add_Step``.
+# If ``STEP_TARGETS`` is not set, clients may still manually call
+# ``ExternalProject_Add_StepTargets`` after calling
+# ``ExternalProject_Add`` or ``ExternalProject_Add_Step``.
#
# This functionality is provided to make it easy to drive the steps
# independently of each other by specifying targets on build command
@@ -299,19 +284,10 @@ define_property(DIRECTORY PROPERTY "EP_STEP_TARGETS" INHERITED
BRIEF_DOCS
"List of ExternalProject steps that automatically get corresponding targets"
FULL_DOCS
- "These targets will be dependent on the main target dependencies"
"See documentation of the ExternalProject_Add_StepTargets() function in the "
"ExternalProject module."
)
-define_property(DIRECTORY PROPERTY "EP_INDEPENDENT_STEP_TARGETS" INHERITED
- BRIEF_DOCS
- "List of ExternalProject steps that automatically get corresponding targets"
- FULL_DOCS
- "These targets will not be dependent on the main target dependencies"
- "See documentation of the ExternalProject_Add_StepTargets() function in the "
- "ExternalProject module."
- )
function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag src_name work_dir gitclone_infofile gitclone_stampfile)
file(WRITE ${script_filename}
@@ -1074,25 +1050,17 @@ endfunction()
function(ExternalProject_Add_StepTargets name)
set(steps ${ARGN})
- if("${ARGV1}" STREQUAL "NO_DEPENDS")
- set(no_deps 1)
- list(REMOVE_AT steps 0)
- 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")
- endif()
_ep_get_step_stampfile(${name} ${step} stamp_file)
add_custom_target(${name}-${step}
DEPENDS ${stamp_file})
# Depend on other external projects (target-level).
- if(NOT no_deps)
- get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
- foreach(arg IN LISTS deps)
- add_dependencies(${name}-${step} ${arg})
- endforeach()
- endif()
+ get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
+ foreach(arg IN LISTS deps)
+ add_dependencies(${name}-${step} ${arg})
+ endforeach()
endforeach()
endfunction()
@@ -1192,17 +1160,6 @@ function(ExternalProject_Add_Step name step)
break()
endif()
endforeach()
-
- get_property(independent_step_targets TARGET ${name} PROPERTY _EP_INDEPENDENT_STEP_TARGETS)
- if(NOT independent_step_targets)
- get_property(independent_step_targets DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS)
- endif()
- foreach(st ${independent_step_targets})
- if("${st}" STREQUAL "${step}")
- ExternalProject_Add_StepTargets(${name} NO_DEPENDS ${step})
- break()
- endif()
- endforeach()
endfunction()
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index b4dca29..602ff0f 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -21,7 +21,6 @@ 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)
@@ -101,8 +100,7 @@ ExternalProject_Add(${proj}
DOWNLOAD_COMMAND ""
INSTALL_COMMAND ""
PATCH_COMMAND ""
- INDEPENDENT_STEP_TARGETS update
- STEP_TARGETS install
+ STEP_TARGETS install update
SVN_REPOSITORY ""
SVN_REVISION ""
SVN_USERNAME ""
@@ -309,7 +307,6 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalCVSRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
@@ -325,7 +322,6 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalCVSRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
@@ -346,7 +342,6 @@ if(do_cvs_tests)
DEPENDS "TutorialStep1-LocalNoDirTGZ"
DEPENDS "TutorialStep1-CVS-20090626"
DEPENDS "TutorialStep1-CVS-testtag1"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "CVS")
endif()
@@ -408,7 +403,6 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -423,7 +417,6 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -436,7 +429,6 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalSVNRepository"
- INDEPENDENT_STEP_TARGETS ""
LOG_DOWNLOAD 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
@@ -491,7 +483,6 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -506,7 +497,6 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -519,7 +509,6 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalGITRepository"
- INDEPENDENT_STEP_TARGETS ""
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
@@ -560,7 +549,6 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
@@ -575,7 +563,6 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
- INDEPENDENT_STEP_TARGETS ""
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
@@ -591,7 +578,6 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
DEPENDS "SetupLocalHGRepository"
- INDEPENDENT_STEP_TARGETS ""
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "HG")
diff --git a/Tests/ExternalProjectUpdate/CMakeLists.txt b/Tests/ExternalProjectUpdate/CMakeLists.txt
index 2cffb69..c33e90b 100644
--- a/Tests/ExternalProjectUpdate/CMakeLists.txt
+++ b/Tests/ExternalProjectUpdate/CMakeLists.txt
@@ -18,7 +18,6 @@ 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 bd720a2..593921f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -137,4 +137,3 @@ 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
deleted file mode 100644
index 4b3de84..0000000
--- a/Tests/RunCMake/ExternalProject/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 4cb051d..0000000
--- a/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 57626d6..0000000
--- a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-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
- URL https://example.org/foo.tar.gz)
-
-ExternalProject_Add(BAR
- URL https://example.org/bar.tar.gz
- 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
deleted file mode 100644
index 48965ad..0000000
--- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include(RunCMake)
-
-run_cmake(NO_DEPENDS)
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 71 ++++----------------
Tests/ExternalProject/CMakeLists.txt | 16 +----
Tests/ExternalProjectUpdate/CMakeLists.txt | 1 -
Tests/RunCMake/CMakeLists.txt | 1 -
Tests/RunCMake/ExternalProject/CMakeLists.txt | 3 -
.../RunCMake/ExternalProject/NO_DEPENDS-stderr.txt | 36 ----------
Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake | 18 -----
Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 3 -
8 files changed, 15 insertions(+), 134 deletions(-)
delete mode 100644 Tests/RunCMake/ExternalProject/CMakeLists.txt
delete mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
delete mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake
delete mode 100644 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list