[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6096-gdb605f8
Brad King
brad.king at kitware.com
Fri Dec 6 15:48:32 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 db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8 (commit)
via de56e933a7f79e77455f796945d7d3f14b7a5cd7 (commit)
via c122104dc1d4c47eb71e748c81370a4d52a09c1e (commit)
from f5631b5b50e2e543c32c1a2d3d347600753bd20a (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=db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8
commit db605f8a8ac9fac7d2b0dbe8494f7264f9e18ef8
Merge: f5631b5 de56e93
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 6 15:48:28 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 6 15:48:28 2013 -0500
Merge topic 'revert-two-topics' into next
de56e93 Revert two topics to untangle them
c122104 Merge topic 'CMakeParseArguments_EmptyArgs' into revert-two-topics
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de56e933a7f79e77455f796945d7d3f14b7a5cd7
commit de56e933a7f79e77455f796945d7d3f14b7a5cd7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 6 15:44:58 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 6 15:46:32 2013 -0500
Revert two topics to untangle them
Revert topics ExternalProject-independent-step-targets and
CMakeParseArguments_EmptyArgs.
diff --git a/Modules/CMakeParseArguments.cmake b/Modules/CMakeParseArguments.cmake
index de3f164..4248176 100644
--- a/Modules/CMakeParseArguments.cmake
+++ b/Modules/CMakeParseArguments.cmake
@@ -2,23 +2,16 @@
# CMakeParseArguments
# -------------------
#
-# Parse arguments given to a macro or a function.
#
-# cmake_parse_arguments() is intended to be used in macros or functions
+#
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords>
+# <multi_value_keywords> args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions
# for parsing the arguments given to that macro or function. It
# processes the arguments and defines a set of variables which hold the
# values of the respective options.
#
-# ::
-#
-# cmake_parse_arguments(<prefix>
-# <options>
-# <one_value_keywords>
-# <multi_value_keywords>
-# [CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY|CMAKE_PARSE_ARGUMENTS_KEEP_EMPTY]
-# args...
-# )
-#
# The <options> argument contains all options for the respective macro,
# i.e. keywords which can be used when calling the macro without any
# value following, like e.g. the OPTIONAL keyword of the install()
@@ -32,7 +25,7 @@
# macro which can be followed by more than one value, like e.g. the
# TARGETS or FILES keywords of the install() command.
#
-# When done, cmake_parse_arguments() will have defined for each of the
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
# keywords listed in <options>, <one_value_keywords> and
# <multi_value_keywords> a variable composed of the given <prefix>
# followed by "_" and the name of the respective keyword. These
@@ -43,17 +36,6 @@
# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see
# whether your macro was called with unrecognized parameters.
#
-# The cmake CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY (old behaviour) and
-# CMAKE_PARSE_ARGUMENTS_KEEP_EMPTY options decide how empty arguments
-# should be handled. If none of these options is set, for backwards
-# compatibility, if CMAKE_MINIMUM_REQUIRED_VERSION < 3.0.0, the default
-# behaviour is to skip empty arguments, otherwise the default behaviour
-# is to keep them. Using the CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
-# variable the user can explicitly set the default behaviour in current
-# scope.
-#
-#
-#
# As an example here a my_install() macro, which takes similar arguments
# as the real install() command:
#
@@ -63,7 +45,7 @@
# set(options OPTIONAL FAST)
# set(oneValueArgs DESTINATION RENAME)
# set(multiValueArgs TARGETS CONFIGURATIONS)
-# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}" )
+# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
# ...
#
#
@@ -98,42 +80,7 @@
# interpreted as the beginning of the new option. E.g.
# my_install(TARGETS foo DESTINATION OPTIONAL) would result in
# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION
-# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore.
-#
-#
-#
-# If the "CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY" option is set,
-# cmake_parse_argumentswill not consider empty arguments.
-# Therefore
-#
-# ::
-#
-# my_install(DESTINATION "" TARGETS foo "" bar)
-#
-# Will set
-#
-# ::
-#
-# MY_INSTALL_DESTINATION = (unset)
-# MY_INSTALL_MULTI = "foo;bar"
-#
-# Using the "CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY" option instead, will set
-#
-# ::
-#
-# MY_INSTALL_SINGLE = ""
-# MY_INSTALL_MULTI = "foo;;bar"
-#
-#
-# It is also important to note that:
-#
-# ::
-#
-# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}" )
-# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-#
-# Will behave differently, because in the latter case empty arguments
-# are not passed to cmake_parse_arguments.
+# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
#=============================================================================
# Copyright 2010 Alexander Neundorf <neundorf at kde.org>
@@ -149,23 +96,29 @@
# License text for the above reference.)
-if(COMMAND cmake_parse_arguments)
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
return()
endif()
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
-function(_CMAKE_PARSE_ARGUMENTS_INTERNAL prefix _optionNames _singleArgNames _multiArgNames _skipEmpty)
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+ # first set all result variables to empty/FALSE
+ foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+ set(${prefix}_${arg_name})
+ endforeach()
+
+ foreach(option ${_optionNames})
+ set(${prefix}_${option} FALSE)
+ endforeach()
+
+ set(${prefix}_UNPARSED_ARGUMENTS)
+
set(insideValues FALSE)
set(currentArgName)
- if(_skipEmpty)
- set(_loopARGN ${ARGN})
- else()
- set(_loopARGN IN LISTS ARGN)
- endif()
-
# now iterate over all arguments and fill the result variables
- foreach(currentArg ${_loopARGN})
+ foreach(currentArg ${ARGN})
list(FIND _optionNames "${currentArg}" optionIndex) # ... then this marks the end of the arguments belonging to this keyword
list(FIND _singleArgNames "${currentArg}" singleArgIndex) # ... then this marks the end of the arguments belonging to this keyword
list(FIND _multiArgNames "${currentArg}" multiArgIndex) # ... then this marks the end of the arguments belonging to this keyword
@@ -173,25 +126,13 @@ function(_CMAKE_PARSE_ARGUMENTS_INTERNAL prefix _optionNames _singleArgNames _mu
if(${optionIndex} EQUAL -1 AND ${singleArgIndex} EQUAL -1 AND ${multiArgIndex} EQUAL -1)
if(insideValues)
if("${insideValues}" STREQUAL "SINGLE")
- if(_skipEmpty)
- set(${prefix}_${currentArgName} ${currentArg})
- else()
- set(${prefix}_${currentArgName} "${currentArg}")
- endif()
+ set(${prefix}_${currentArgName} ${currentArg})
set(insideValues FALSE)
elseif("${insideValues}" STREQUAL "MULTI")
- if(_skipEmpty)
- list(APPEND ${prefix}_${currentArgName} ${currentArg})
- else()
- list(APPEND ${prefix}_${currentArgName} "${currentArg}")
- endif()
+ list(APPEND ${prefix}_${currentArgName} ${currentArg})
endif()
else()
- if(_skipEmpty)
- list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
- else()
- list(APPEND ${prefix}_UNPARSED_ARGUMENTS "${currentArg}")
- endif()
+ list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
endif()
else()
if(NOT ${optionIndex} EQUAL -1)
@@ -211,67 +152,9 @@ function(_CMAKE_PARSE_ARGUMENTS_INTERNAL prefix _optionNames _singleArgNames _mu
endforeach()
# propagate the result variables to the caller:
- foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames} UNPARSED_ARGUMENTS)
- if(DEFINED ${prefix}_${arg_name})
- set(${prefix}_${arg_name} "${${prefix}_${arg_name}}" PARENT_SCOPE)
- endif()
+ foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+ set(${prefix}_${arg_name} ${${prefix}_${arg_name}} PARENT_SCOPE)
endforeach()
+ set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
endfunction()
-
-
-# This "wrapper" macro is a workaround that allows to use this version of this
-# module with CMake <= 2.8.12
-# Before that version set(VAR "" PARENT_SCOPE) did not set the variable in
-# the parent scope and instead it used to unset it.
-# This wrapper calls the real function, but if necessary (i.e. when empty
-# arguments should not be skipped and CMake < 3.0.0) it parses the arguments
-# again in order to find single and multiple arguments that have not been set
-# and sets them to an empty string in the same variable scope as the caller.
-macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
- # first set all result variables to empty/FALSE
- foreach(arg_name ${_singleArgNames} ${_multiArgNames})
- set(${prefix}_${arg_name})
- endforeach()
-
- foreach(option ${_optionNames})
- set(${prefix}_${option} FALSE)
- endforeach()
-
- set(${prefix}_UNPARSED_ARGUMENTS)
-
- if("x${ARGN}" MATCHES "^xCMAKE_PARSE_ARGUMENTS_(SKIP|KEEP)_EMPTY;?")
- if("${CMAKE_MATCH_1}" STREQUAL "SKIP")
- set(_skipEmpty 1)
- elseif("${CMAKE_MATCH_1}" STREQUAL "KEEP")
- set(_skipEmpty 0)
- endif()
- string(REGEX REPLACE "^${CMAKE_MATCH_0}" "" ARGN "x${ARGN}")
- elseif(DEFINED CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
- set(_skipEmpty "${CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY}")
- elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.0.0)
- # Keep compatibility with previous releases
- set(_skipEmpty 1)
- else()
- set(_skipEmpty 0)
- endif()
-
- _cmake_parse_arguments_internal("${prefix}" "${_optionNames}" "${_singleArgNames}" "${_multiArgNames}" "${_skipEmpty}" "${ARGN}")
-
- if(NOT _skipEmpty AND CMAKE_VERSION VERSION_LESS 3.0.0)
- set(__singleArgNames ${_singleArgNames})
- set(__multiArgNames ${_multiArgNames})
- foreach(currentArg ${ARGN})
- if(NOT DEFINED ${prefix}_${currentArg})
- list(FIND __singleArgNames "${currentArg}" _singleArgIndex)
- list(FIND __multiArgNames "${currentArg}" _multiArgIndex)
- if(NOT ${_singleArgIndex} EQUAL -1 OR NOT ${_multiArgIndex} EQUAL -1)
- set(${prefix}_${currentArg} "")
- endif()
- endif()
- endforeach()
- unset(__singleArgNames)
- unset(__multiArgNames)
- endif()
-
-endmacro()
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/Source/cmDefinePropertyCommand.h b/Source/cmDefinePropertyCommand.h
index c4143cf..8dc4d96 100644
--- a/Source/cmDefinePropertyCommand.h
+++ b/Source/cmDefinePropertyCommand.h
@@ -34,13 +34,6 @@ public:
*/
virtual const char* GetName() const { return "define_property";}
- /**
- * This determines if the command is invoked when in script mode.
- * define_property() will have no effect in script mode, but this will
- * make many of the modules usable in cmake/ctest scripts.
- */
- virtual bool IsScriptable() const { return true; }
-
cmTypeMacro(cmDefinePropertyCommand, cmCommand);
private:
std::string PropertyName;
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 8947d41..209b0b3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -135,5 +135,3 @@ 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)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
deleted file mode 100644
index 55e5c0b..0000000
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
-# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1
-# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY KEEP
-# => KEEP
-
-cmake_minimum_required(VERSION 2.8.12)
-
-include(CMakeParseArguments)
-
-set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" CMAKE_PARSE_ARGUMENTS_KEEP_EMPTY "${ARGN}")
-endmacro()
-
-my_install(DESTINATION "" TARGETS foo "" bar)
-
-if(NOT DEFINED MY_INSTALL_DESTINATION)
- message(FATAL_ERROR "NOT DEFINED MY_INSTALL_DESTINATION")
-elseif(NOT "${MY_INSTALL_DESTINATION}" STREQUAL "")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_DESTINATION}\" STREQUAL \"\"")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;;bar\"")
-endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
deleted file mode 100644
index ae8a920..0000000
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
-# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0
-# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY SKIP
-# => SKIP
-
-cmake_minimum_required(VERSION 2.8.12)
-
-include(CMakeParseArguments)
-
-set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" CMAKE_PARSE_ARGUMENTS_SKIP_EMPTY "${ARGN}")
-endmacro()
-
-my_install(DESTINATION "" TARGETS foo "" bar)
-
-if(DEFINED MY_INSTALL_DESTINATION)
- message(FATAL_ERROR "DEFINED MY_INSTALL_DESTINATION")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;bar\"")
-endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/CMakeLists.txt b/Tests/RunCMake/CMakeParseArguments/CMakeLists.txt
deleted file mode 100644
index 4b3de84..0000000
--- a/Tests/RunCMake/CMakeParseArguments/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/CMakeParseArguments/DifferentScope-subdir1/CMakeLists.txt b/Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir1/CMakeLists.txt
deleted file mode 100644
index 19871cc..0000000
--- a/Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir1/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(CMakeParseArguments)
diff --git a/Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir2/CMakeLists.txt b/Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir2/CMakeLists.txt
deleted file mode 100644
index 4d1e6e4..0000000
--- a/Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir2/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-include(CMakeParseArguments)
-
-macro(mymacro)
- set(options )
- set(oneValueArgs)
- set(multiValueArgs)
- cmake_parse_arguments(MY_ "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}" )
-endmacro()
-
-mymacro()
diff --git a/Tests/RunCMake/CMakeParseArguments/DifferentScope.cmake b/Tests/RunCMake/CMakeParseArguments/DifferentScope.cmake
deleted file mode 100644
index 6441bec..0000000
--- a/Tests/RunCMake/CMakeParseArguments/DifferentScope.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-add_subdirectory(DifferentScope-subdir1)
-add_subdirectory(DifferentScope-subdir2)
diff --git a/Tests/RunCMake/CMakeParseArguments/Example.cmake b/Tests/RunCMake/CMakeParseArguments/Example.cmake
deleted file mode 100644
index 063b5f8..0000000
--- a/Tests/RunCMake/CMakeParseArguments/Example.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-include(CMakeParseArguments)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-endmacro()
-
-my_install(TARGETS foo bar DESTINATION bin OPTIONAL)
-
-if(NOT MY_INSTALL_OPTIONAL)
- message(FATAL_ERROR "NOT MY_INSTALL_OPTIONAL")
-endif()
-
-if(MY_INSTALL_FAST)
- message(FATAL_ERROR "MY_INSTALL_FAST")
-endif()
-
-if(NOT "${MY_INSTALL_DESTINATION}" STREQUAL "bin")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_DESTINATION}\" STREQUAL \"bin\"")
-endif()
-
-if(DEFINED MY_INSTALL_RENAME)
- message(FATAL_ERROR "DEFINED MY_INSTALL_RENAME")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;bar\"")
-endif()
-
-if(DEFINED MY_INSTALL_CONFIGURATIONS)
- message(FATAL_ERROR "DEFINED MY_INSTALL_CONFIGURATIONS")
-endif()
-
-if(DEFINED MY_INSTALL_UNPARSED_ARGUMENTS)
- message(DEFINED MY_INSTALL_UNPARSED_ARGUMENTS)
-endif()
-
-
-
-my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
-
-if(NOT MY_INSTALL_OPTIONAL)
- message(FATAL_ERROR "NOT MY_INSTALL_OPTIONAL")
-endif()
-
-if(MY_INSTALL_FAST)
- message(FATAL_ERROR "MY_INSTALL_FAST")
-endif()
-
-if(NOT "${MY_INSTALL_DESTINATION}" STREQUAL "bin")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_DESTINATION}\" STREQUAL \"bin\"")
-endif()
-
-if(DEFINED MY_INSTALL_RENAME)
- message(FATAL_ERROR "DEFINED MY_INSTALL_RENAME")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;bar\"")
-endif()
-
-if(DEFINED MY_INSTALL_CONFIGURATIONS)
- message(FATAL_ERROR "DEFINED MY_INSTALL_CONFIGURATIONS")
-endif()
-
-if(NOT "${MY_INSTALL_UNPARSED_ARGUMENTS}" STREQUAL "blub")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_UNPARSED_ARGUMENTS}\" STREQUAL \"blub\"")
-endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake b/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
deleted file mode 100644
index 8b72473..0000000
--- a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include(RunCMake)
-
-run_cmake(Example)
-run_cmake(VERSION-SKIP)
-run_cmake(VERSION-KEEP)
-run_cmake(VARIABLE-SKIP)
-run_cmake(VARIABLE-KEEP)
-run_cmake(ARGUMENT-SKIP)
-run_cmake(ARGUMENT-KEEP)
-run_cmake(DifferentScope)
diff --git a/Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake b/Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake
deleted file mode 100644
index 72ebe94..0000000
--- a/Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
-# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0
-# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY UNSET
-# => KEEP
-
-cmake_minimum_required(VERSION 2.8.12)
-
-include(CMakeParseArguments)
-
-set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-endmacro()
-
-my_install(DESTINATION "" TARGETS foo "" bar)
-
-if(NOT DEFINED MY_INSTALL_DESTINATION)
- message(FATAL_ERROR "NOT DEFINED MY_INSTALL_DESTINATION")
-elseif(NOT "${MY_INSTALL_DESTINATION}" STREQUAL "")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_DESTINATION}\" STREQUAL \"\"")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;;bar\"")
-endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake b/Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake
deleted file mode 100644
index c7fc52c..0000000
--- a/Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
-# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1
-# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY UNSET
-# => SKIP
-
-cmake_minimum_required(VERSION 2.8.12)
-
-include(CMakeParseArguments)
-
-set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-endmacro()
-
-my_install(DESTINATION "" TARGETS foo "" bar)
-
-if(DEFINED MY_INSTALL_DESTINATION)
- message(FATAL_ERROR "DEFINED MY_INSTALL_DESTINATION")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;bar\"")
-endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake b/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake
deleted file mode 100644
index 2990dc1..0000000
--- a/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# CMAKE_MINIMUM_REQUIRED_VERSION 3.0.0
-# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY UNSET
-# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY UNSET
-# => KEEP
-
-cmake_minimum_required(VERSION 2.8.12)
-# This is a hack, required to test the behaviour in CMake 3.0.0 before
-# it is actually released
-set(CMAKE_MINIMUM_REQUIRED_VERSION 3.0.0)
-
-include(CMakeParseArguments)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-endmacro()
-
-my_install(DESTINATION "" TARGETS foo "" bar)
-
-if(NOT DEFINED MY_INSTALL_DESTINATION)
- message(FATAL_ERROR "NOT DEFINED MY_INSTALL_DESTINATION")
-elseif(NOT "${MY_INSTALL_DESTINATION}" STREQUAL "")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_DESTINATION}\" STREQUAL \"\"")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;;bar\"")
-endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/VERSION-SKIP.cmake b/Tests/RunCMake/CMakeParseArguments/VERSION-SKIP.cmake
deleted file mode 100644
index 88ff49c..0000000
--- a/Tests/RunCMake/CMakeParseArguments/VERSION-SKIP.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
-# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY UNSET
-# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY UNSET
-# => SKIP
-
-cmake_minimum_required(VERSION 2.8.12)
-
-include(CMakeParseArguments)
-
-macro(MY_INSTALL)
- set(options OPTIONAL FAST)
- set(oneValueArgs DESTINATION RENAME)
- set(multiValueArgs TARGETS CONFIGURATIONS)
- cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-endmacro()
-
-my_install(DESTINATION "" TARGETS foo "" bar)
-
-if(DEFINED MY_INSTALL_DESTINATION)
- message(FATAL_ERROR "DEFINED MY_INSTALL_DESTINATION")
-endif()
-
-if(NOT "${MY_INSTALL_TARGETS}" STREQUAL "foo;bar")
- message(FATAL_ERROR "NOT \"\${MY_INSTALL_TARGETS}\" STREQUAL \"foo;bar\"")
-endif()
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c122104dc1d4c47eb71e748c81370a4d52a09c1e
commit c122104dc1d4c47eb71e748c81370a4d52a09c1e
Merge: 237d1da 84afa2a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 6 15:45:50 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 6 15:45:50 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into revert-two-topics
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeParseArguments.cmake | 175 ++++----------------
Modules/ExternalProject.cmake | 71 ++-------
Source/cmDefinePropertyCommand.h | 7 -
Tests/ExternalProject/CMakeLists.txt | 16 +--
Tests/ExternalProjectUpdate/CMakeLists.txt | 1 -
Tests/RunCMake/CMakeLists.txt | 2 -
.../CMakeParseArguments/ARGUMENT-KEEP.cmake | 29 ----
.../CMakeParseArguments/ARGUMENT-SKIP.cmake | 27 ---
Tests/RunCMake/CMakeParseArguments/CMakeLists.txt | 3 -
.../DifferentScope-subdir1/CMakeLists.txt | 1 -
.../DifferentScope-subdir2/CMakeLists.txt | 10 -
.../CMakeParseArguments/DifferentScope.cmake | 4 -
Tests/RunCMake/CMakeParseArguments/Example.cmake | 70 --------
.../CMakeParseArguments/RunCMakeTest.cmake | 10 -
.../CMakeParseArguments/VARIABLE-KEEP.cmake | 29 ----
.../CMakeParseArguments/VARIABLE-SKIP.cmake | 27 ---
.../CMakeParseArguments/VERSION-KEEP.cmake | 30 ----
.../CMakeParseArguments/VERSION-SKIP.cmake | 25 ---
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 -
22 files changed, 44 insertions(+), 553 deletions(-)
delete mode 100644 Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir1/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMakeParseArguments/DifferentScope-subdir2/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMakeParseArguments/DifferentScope.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/Example.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake
delete mode 100644 Tests/RunCMake/CMakeParseArguments/VERSION-SKIP.cmake
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