summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-12-30 15:33:28 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-12-30 15:33:28 (GMT)
commitd30a1274b2db10934a149cbe73a25b048bf7051c (patch)
tree41d820b8f8ac82d572514994b63d5d86d7ca4c44 /config/cmake
parentddf59dd30f8e584f1a5eb7cc538b3abb9d5ee8e5 (diff)
downloadhdf5-d30a1274b2db10934a149cbe73a25b048bf7051c.zip
hdf5-d30a1274b2db10934a149cbe73a25b048bf7051c.tar.gz
hdf5-d30a1274b2db10934a149cbe73a25b048bf7051c.tar.bz2
[svn-r21853] Updated cdash variables for use with CTestScript.cmake processing.
Tested: windows
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/CTest.cmake15
1 files changed, 7 insertions, 8 deletions
diff --git a/config/cmake/CTest.cmake b/config/cmake/CTest.cmake
index c69166c..178e2ae 100644
--- a/config/cmake/CTest.cmake
+++ b/config/cmake/CTest.cmake
@@ -225,15 +225,14 @@ IF(BUILD_TESTING)
IF(DART_CXX_NAME MATCHES "devenv")
GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_CXX_NAME)
ENDIF(DART_CXX_NAME MATCHES "devenv")
- IF (SYSTEM_NAME_EXT)
- SET (BUILD_NAME_SYSTEM_NAME "${BUILD_NAME_SYSTEM_NAME}_${SYSTEM_NAME_EXT}")
- ENDIF (SYSTEM_NAME_EXT)
- IF(BUILD_NAME_EXT)
- SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}-${BUILD_NAME_EXT}")
- ELSE(BUILD_NAME_EXT)
- SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
- ENDIF( BUILD_NAME_EXT)
+ SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
ENDIF(NOT BUILDNAME)
+ IF (SYSTEM_NAME_EXT)
+ SET (BUILDNAME "${BUILDNAME}_${SYSTEM_NAME_EXT}")
+ ENDIF (SYSTEM_NAME_EXT)
+ IF(BUILD_NAME_EXT)
+ SET(BUILDNAME "${BUILDNAME}-${BUILD_NAME_EXT}")
+ ENDIF(BUILD_NAME_EXT)
# the build command
BUILD_COMMAND(MAKECOMMAND_DEFAULT_VALUE