[Cmake-commits] CMake branch, next, updated. v2.8.5-1887-g4fc0347
David Cole
david.cole at kitware.com
Wed Sep 14 10:52:54 EDT 2011
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 4fc03477939ff1915c710db6e8adee3ff7d9790c (commit)
via c336778c528a82d66cd986c642c11156b5da1524 (commit)
via 2a3441b65ffb0b50cd0c05827b3b5ff877ad32b7 (commit)
from f0f11055ce4ad8a50ff8ea51342c5cd9becf51c0 (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=4fc03477939ff1915c710db6e8adee3ff7d9790c
commit 4fc03477939ff1915c710db6e8adee3ff7d9790c
Merge: f0f1105 c336778
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Sep 14 10:52:51 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 10:52:51 2011 -0400
Merge topic 'fix-build-testing-problem' into next
c336778 CMake: Reference test targets only when BUILD_TESTING is ON
2a3441b KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c336778c528a82d66cd986c642c11156b5da1524
commit c336778c528a82d66cd986c642c11156b5da1524
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Sep 14 10:38:04 2011 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Wed Sep 14 10:38:04 2011 -0400
CMake: Reference test targets only when BUILD_TESTING is ON
You cannot set a property on a target that's not there, and
these targets are not there when BUILD_TESTING is OFF.
Thanks to Sankhesh Jhaveri for the bug report.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf948c2..788b386 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,11 +231,13 @@ MACRO (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}_c "${kwsys_folder}")
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}EncodeExecutable "${kwsys_folder}")
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}ProcessFwd9x "${kwsys_folder}")
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestDynload "${kwsys_folder}")
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestProcess "${kwsys_folder}")
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestsC "${kwsys_folder}")
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestsCxx "${kwsys_folder}")
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
+ if(BUILD_TESTING)
+ CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestDynload "${kwsys_folder}")
+ CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestProcess "${kwsys_folder}")
+ CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestsC "${kwsys_folder}")
+ CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestsCxx "${kwsys_folder}")
+ CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
+ endif()
#---------------------------------------------------------------------
# Setup third-party libraries.
@@ -598,7 +600,9 @@ ADD_SUBDIRECTORY(Source)
ADD_SUBDIRECTORY(Utilities)
ADD_SUBDIRECTORY(Tests)
-CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests")
+if(BUILD_TESTING)
+ CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests")
+endif()
CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat")
CMAKE_SET_TARGET_FOLDER(documentation "Documentation")
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 16 ++++++++++------
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list