[Cmake-commits] CMake branch, next, updated. v2.8.10.1-842-g6d88ba9
David Cole
david.cole at kitware.com
Fri Nov 9 12:43:14 EST 2012
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 6d88ba91dcce4ba334dac1c312835f7c6006481c (commit)
via e3748ddc22b7fe799072e404656fdb0ac4e6760f (commit)
from b2b5299822736d9360d37a3daea51c44a97768c3 (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=6d88ba91dcce4ba334dac1c312835f7c6006481c
commit 6d88ba91dcce4ba334dac1c312835f7c6006481c
Merge: b2b5299 e3748dd
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 9 12:43:11 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 9 12:43:11 2012 -0500
Merge topic 'only-git-fetch-when-necessary' into next
e3748dd Tests: Use WORKING_DIRECTORY test property instead of add_test keyword
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3748ddc22b7fe799072e404656fdb0ac4e6760f
commit e3748ddc22b7fe799072e404656fdb0ac4e6760f
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 9 12:40:24 2012 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 9 12:40:24 2012 -0500
Tests: Use WORKING_DIRECTORY test property instead of add_test keyword
...since the keyword is not processed properly by CMake 2.8.2, but
the test property is.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9d13625..c394fc6 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -998,7 +998,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
add_test(NAME ExternalProjectUpdate
- WORKING_DIRECTORY ${CMake_SOURCE_DIR}/Tests/ExternalProjectUpdate
COMMAND ${CMAKE_CMAKE_COMMAND}
-DExternalProjectUpdate_SOURCE_DIR:PATH=${CMake_SOURCE_DIR}/Tests/ExternalProjectUpdate
-DExternalProjectUpdate_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/ExternalProjectUpdate
@@ -1010,6 +1009,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProjectUpdate")
set_tests_properties(ExternalProjectUpdate PROPERTIES
TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}
+ WORKING_DIRECTORY ${CMake_SOURCE_DIR}/Tests/ExternalProjectUpdate
DEPENDS ExternalProjectUpdateSetup )
# do each of the tutorial steps
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list