From 68fafa257a977e36a4c4f0303002dabc2ff6454e Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 15 May 2008 09:08:02 +0000 Subject: [PATCH] ENH: bye bye Dart, welcome CDash --- CMakeLists.txt | 10 +++++----- CTestConfig.cmake | 7 +++++++ DartConfig.cmake | 11 ----------- 3 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 CTestConfig.cmake delete mode 100644 DartConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index cdccd4aa..3d6c22be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0) SET(GDCM_MAJOR_VERSION 1) SET(GDCM_MINOR_VERSION 3) SET(GDCM_BUILD_VERSION 2) -SET(GDCM_VERSION +SET(GDCM_VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}") #----------------------------------------------------------------------------- @@ -23,7 +23,6 @@ IF(CMAKE_COMPILER_2005) ADD_DEFINITIONS(-D_SCL_SECURE_NO_DEPRECATE) ENDIF(CMAKE_COMPILER_2005) - #----------------------------------------------------------------------------- # Build shared lib by default OPTION(BUILD_SHARED_LIBS "Build GDCM with shared libraries." ON) @@ -268,10 +267,11 @@ OPTION(BUILD_TESTING "Build testing." ON) IF(BUILD_TESTING) CONFIGURE_FILE(${GDCM_SOURCE_DIR}/CMake/CTestCustom.ctest.in - ${GDCM_BINARY_DIR}/CTestCustom.ctest @ONLY) + ${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY) + FILE(WRITE ${GDCM_BINARY_DIR}/CTestCustom.cmake + "INCLUDE(\"${GDCM_BINARY_DIR}/CMake/CTestCustom.ctest\")\n") ENABLE_TESTING() - INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - MARK_AS_ADVANCED(DART_ROOT) + INCLUDE(CTest) SUBDIRS(Testing) ENDIF(BUILD_TESTING) diff --git a/CTestConfig.cmake b/CTestConfig.cmake new file mode 100644 index 00000000..46edeeb0 --- /dev/null +++ b/CTestConfig.cmake @@ -0,0 +1,7 @@ +set(CTEST_PROJECT_NAME "GDCM") +set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT") + +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "www.cdash.org") +set(CTEST_DROP_LOCATION "/CDash/submit.php?project=GDCM") +set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/DartConfig.cmake b/DartConfig.cmake deleted file mode 100644 index 71e2ef40..00000000 --- a/DartConfig.cmake +++ /dev/null @@ -1,11 +0,0 @@ -# Dashboard is opened for submissions for a 24 hour period starting at -# the specified NIGHLY_START_TIME. Time is specified in 24 hour format. -SET (NIGHTLY_START_TIME "21:00:00 EDT") - -# Dart server to submit results (used by client) -SET (DROP_METHOD "http") -SET (DROP_SITE "public.kitware.com") -SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi") -SET (TRIGGER_SITE - "http://${DROP_SITE}/cgi-bin/Submit-GDCM-TestingResults.cgi") - -- 2.45.1