summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2008-03-04 14:10:05 (GMT)
committerKen Martin <ken.martin@kitware.com>2008-03-04 14:10:05 (GMT)
commitefb309fe2981f7030946b057544bc6c413c74744 (patch)
tree77a1de860e371d82746c5192ebc8c142a413ba4e /CMakeLists.txt
parent31efe9e9f67d4b30740b227c3d792c85c85755ab (diff)
downloadCMake-efb309fe2981f7030946b057544bc6c413c74744.zip
CMake-efb309fe2981f7030946b057544bc6c413c74744.tar.gz
CMake-efb309fe2981f7030946b057544bc6c413c74744.tar.bz2
BUG: undo accidental commit
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4c9b7..20a161f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,9 @@ ENDMACRO(CMAKE_TEST_FOR_MFC)
# for testing. Simply to improve readability of the main script.
#-----------------------------------------------------------------------
MACRO(CMAKE_SETUP_TESTING)
- SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
+ IF (NOT DART_ROOT)
+ SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
+ ENDIF (NOT DART_ROOT)
IF(BUILD_TESTING)
SET(CMAKE_TEST_GENERATOR "" CACHE STRING
@@ -188,6 +190,11 @@ MACRO(CMAKE_SETUP_TESTING)
${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
+ IF(BUILD_TESTING AND DART_ROOT)
+ CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif
+ ${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
+ ENDIF(BUILD_TESTING AND DART_ROOT)
+ MARK_AS_ADVANCED(DART_ROOT)
MARK_AS_ADVANCED(CURL_TESTING)
ENDMACRO(CMAKE_SETUP_TESTING)
@@ -358,7 +365,7 @@ SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
# Include the standard Dart testing module
ENABLE_TESTING()
-INCLUDE (${CMAKE_ROOT}/Modules/CTest.cmake)
+INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
# where to write the resulting executables and libraries
SET(BUILD_SHARED_LIBS OFF)