summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-01-28 18:20:53 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-01-28 18:20:53 (GMT)
commit62aba58b82e200fb25dd67f48d12ecf1297e1228 (patch)
tree00a710ebb8710668810eb81ccf534f7a44c96bf2
parente9eccb00981bdbfec0dc793b1e1eeb06fe4799eb (diff)
downloadCMake-62aba58b82e200fb25dd67f48d12ecf1297e1228.zip
CMake-62aba58b82e200fb25dd67f48d12ecf1297e1228.tar.gz
CMake-62aba58b82e200fb25dd67f48d12ecf1297e1228.tar.bz2
ENH: Better checking for Dart. Closes Bug #1505 - Configuration fails to create Makefile
-rw-r--r--Modules/Dart.cmake15
1 files changed, 10 insertions, 5 deletions
diff --git a/Modules/Dart.cmake b/Modules/Dart.cmake
index 74a1a2d..bf54a41 100644
--- a/Modules/Dart.cmake
+++ b/Modules/Dart.cmake
@@ -157,18 +157,23 @@ IF(BUILD_TESTING)
)
# BUILDNAME
+ SET(HAVE_DART)
+ IF(EXISTS "${DART_ROOT}/Source/Client/Dart.conf.in")
+ SET(HAVE_DART 1)
+ ENDIF(EXISTS "${DART_ROOT}/Source/Client/Dart.conf.in")
+
#
# Section #2:
#
# Make necessary directories and configure testing scripts
#
# find a tcl shell command
- IF(DART_ROOT)
+ IF(HAVE_DART)
INCLUDE(${CMAKE_ROOT}/Modules/FindTclsh.cmake)
- ENDIF(DART_ROOT)
+ ENDIF(HAVE_DART)
- IF (DART_ROOT AND TCL_TCLSH)
+ IF (HAVE_DART AND TCL_TCLSH)
# make directories in the binary tree
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Dashboard
${PROJECT_BINARY_DIR}/Testing/HTML/TestingResults/Sites/${SITE}/${BUILDNAME})
@@ -257,7 +262,7 @@ IF(BUILD_TESTING)
${TCL_TCLSH} ${DART_ROOT}/Source/Client/DashboardManager.tcl ${PROJECT_BINARY_DIR}/DartConfiguration.tcl Nightly DashboardEnd)
ENDIF (${CMAKE_MAKE_PROGRAM} MATCHES make)
- ELSE(DART_ROOT AND TCL_TCLSH)
+ ELSE(HAVE_DART AND TCL_TCLSH)
# make directories in the binary tree
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/Temporary)
GET_FILENAME_COMPONENT(CMAKE_HOST_PATH ${CMAKE_COMMAND} PATH)
@@ -306,7 +311,7 @@ IF(BUILD_TESTING)
ENDFOREACH(testtype)
ENDFOREACH(mode)
ENDIF (${CMAKE_MAKE_PROGRAM} MATCHES make)
- ENDIF (DART_ROOT AND TCL_TCLSH)
+ ENDIF (HAVE_DART AND TCL_TCLSH)
ENDIF(BUILD_TESTING)
#