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 d08809ae30abab134b1eb375124eb08f1c5b1bde (commit)
via bf94493bde831b47d9f6afed25d7a5b701607f23 (commit)
from 466abce5f276f99678137ea06f6a59fdf26d563c (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=d08809ae30abab134b1eb375124eb08f1c5b1bde
commit d08809ae30abab134b1eb375124eb08f1c5b1bde
Merge: 466abce bf94493
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 4 10:14:58 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Dec 4 10:14:58 2014 -0500
Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN' into next
bf94493b Revert "ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf94493bde831b47d9f6afed25d7a5b701607f23
commit bf94493bde831b47d9f6afed25d7a5b701607f23
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 4 10:14:36 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Dec 4 10:14:36 2014 -0500
Revert "ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option"
This reverts commit 0bdf24548b2059d9e11520f2de492b4847aefb8f.
It will be revised and restored.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
deleted file mode 100644
index dfbf108..0000000
--- a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_TEST_EXCLUDE_FROM_MAIN
---------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
- command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
- from the main build.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7e4cc37..e5616b1 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -149,8 +149,6 @@ Create custom targets to build projects in external trees
Add test step executed before install step
``TEST_AFTER_INSTALL 1``
Add test step executed after install step
- ``TEST_EXCLUDE_FROM_MAIN 1``
- Main target does not depend on the test step
``TEST_COMMAND <cmd>...``
Command to drive test
@@ -2195,13 +2193,12 @@ function(_ep_add_test_command name)
get_property(before TARGET ${name} PROPERTY _EP_TEST_BEFORE_INSTALL)
get_property(after TARGET ${name} PROPERTY _EP_TEST_AFTER_INSTALL)
- get_property(exclude TARGET ${name} PROPERTY _EP_TEST_EXCLUDE_FROM_MAIN)
get_property(cmd_set TARGET ${name} PROPERTY _EP_TEST_COMMAND SET)
# Only actually add the test step if one of the test related properties is
# explicitly set. (i.e. the test step is omitted unless requested...)
#
- if(cmd_set OR before OR after OR exclude)
+ if(cmd_set OR before OR after)
if(cmd_set)
get_property(cmd TARGET ${name} PROPERTY _EP_TEST_COMMAND)
else()
@@ -2209,21 +2206,9 @@ function(_ep_add_test_command name)
endif()
if(before)
- set(dependees_args DEPENDEES build)
+ set(dep_args DEPENDEES build DEPENDERS install)
else()
- set(dependees_args DEPENDEES install)
- endif()
-
- if(exclude)
- set(dependers_args "")
- set(exclude_args EXCLUDE_FROM_MAIN 1)
- else()
- if(before)
- set(dependers_args DEPENDERS install)
- else()
- set(dependers_args "")
- endif()
- set(exclude_args "")
+ set(dep_args DEPENDEES install)
endif()
get_property(log TARGET ${name} PROPERTY _EP_LOG_TEST)
@@ -2236,9 +2221,7 @@ function(_ep_add_test_command name)
ExternalProject_Add_Step(${name} test
COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir}
- ${dependees_args}
- ${dependers_args}
- ${exclude_args}
+ ${dep_args}
${log}
)
endif()
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt
b/Tests/ExternalProjectLocal/CMakeLists.txt
index a71c869..cbbb555 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -71,31 +71,6 @@ if(can_build_tutorial_step5)
LOG_TEST 1
)
set_property(TARGET ${proj} PROPERTY FOLDER "Local")
-
- set(proj TutorialStep5-Local-TestExcludeFromMainBefore)
- ExternalProject_Add(${proj}
- URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
- CMAKE_ARGS -G ${CMAKE_GENERATOR} <SOURCE_DIR>
- CMAKE_CACHE_DEFAULT_ARGS -DUSE_MYMATH:BOOL=OFF
- TEST_BEFORE_INSTALL 1
- TEST_EXCLUDE_FROM_MAIN 1
- STEP_TARGETS test
- LOG_TEST 1
- )
- set_property(TARGET ${proj} PROPERTY FOLDER "Local")
-
- set(proj TutorialStep5-Local-TestExcludeFromMainAfter)
- ExternalProject_Add(${proj}
- URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
- CMAKE_ARGS -G ${CMAKE_GENERATOR} <SOURCE_DIR>
- CMAKE_CACHE_DEFAULT_ARGS -DUSE_MYMATH:BOOL=OFF
- TEST_AFTER_INSTALL 1
- TEST_EXCLUDE_FROM_MAIN 1
- STEP_TARGETS test
- LOG_TEST 1
- )
- set_property(TARGET ${proj} PROPERTY FOLDER "Local")
-
endif()
-----------------------------------------------------------------------
Summary of changes:
.../dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst | 6 -----
Modules/ExternalProject.cmake | 25 ++++----------------
Tests/ExternalProjectLocal/CMakeLists.txt | 25 --------------------
3 files changed, 4 insertions(+), 52 deletions(-)
delete mode 100644 Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
