summaryrefslogtreecommitdiffstats
path: root/config/cmake/CTest.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-12-30 15:33:06 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-12-30 15:33:06 (GMT)
commitaa38c92449babe1bc724c7c2ea2279bc006d594b (patch)
tree5302072365f2f51d6ecefdf365d9ac6adb09dd8d /config/cmake/CTest.cmake
parentc5140decc3985107a171f8a812499797ca6cff74 (diff)
downloadhdf5-aa38c92449babe1bc724c7c2ea2279bc006d594b.zip
hdf5-aa38c92449babe1bc724c7c2ea2279bc006d594b.tar.gz
hdf5-aa38c92449babe1bc724c7c2ea2279bc006d594b.tar.bz2
[svn-r21852] Updated cdash variables for use with CTestScript.cmake processing.
Tested: windows
Diffstat (limited to 'config/cmake/CTest.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