@@ -17,38 +17,40 @@ cmake_minimum_required (VERSION 3.26)
1717# -----------------------------------------------------------
1818# -- Get environment
1919# -----------------------------------------------------------
20- if (NOT SITE_OS_NAME)
21- ## machine name not provided - attempt to discover with uname
22- ## -- set hostname
23- ## --------------------------
24- find_program (HOSTNAME_CMD NAMES hostname)
25- execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
26- set (CTEST_SITE "${HOSTNAME}${CTEST_SITE_EXT} " )
27- find_program (UNAME NAMES uname)
28- macro (getuname name flag)
29- execute_process (COMMAND "${UNAME} " "${flag} " OUTPUT_VARIABLE "${name} " OUTPUT_STRIP_TRAILING_WHITESPACE)
30- endmacro ()
20+ if (NOT CTEST_BUILD_NAME) # Note! if CTEST_BUILD_NAME is set CTEST_SITE must also be set
21+ if (NOT SITE_OS_NAME)
22+ ## machine name not provided - attempt to discover with uname
23+ ## -- set hostname
24+ ## --------------------------
25+ find_program (HOSTNAME_CMD NAMES hostname)
26+ execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
27+ set (CTEST_SITE "${HOSTNAME}${CTEST_SITE_EXT} " )
28+ find_program (UNAME NAMES uname)
29+ macro (getuname name flag)
30+ execute_process (COMMAND "${UNAME} " "${flag} " OUTPUT_VARIABLE "${name} " OUTPUT_STRIP_TRAILING_WHITESPACE)
31+ endmacro ()
3132
32- getuname (osname -s)
33- string (STRIP ${osname} osname)
34- getuname (osrel -r)
35- string (STRIP ${osrel} osrel)
36- getuname (cpu -m)
37- string (STRIP ${cpu} cpu)
38- message (STATUS "Dashboard script uname output: ${osname} -${osrel} -${cpu} \n " )
33+ getuname (osname -s)
34+ string (STRIP ${osname} osname)
35+ getuname (osrel -r)
36+ string (STRIP ${osrel} osrel)
37+ getuname (cpu -m)
38+ string (STRIP ${cpu} cpu)
39+ message (STATUS "Dashboard script uname output: ${osname} -${osrel} -${cpu} \n " )
3940
40- set (CTEST_BUILD_NAME "${osname} -${osrel} -${cpu} " )
41- else ()
42- ## machine name provided
43- ## --------------------------
44- if (CMAKE_HOST_UNIX )
45- set (CTEST_BUILD_NAME "${SITE_OS_NAME} -${SITE_OS_VERSION} -${SITE_OS_BITS} -${SITE_COMPILER_NAME} -${SITE_COMPILER_VERSION} " )
41+ set (CTEST_BUILD_NAME "${osname} -${osrel} -${cpu} " )
4642 else ()
47- set (CTEST_BUILD_NAME "${SITE_OS_NAME} -${SITE_OS_VERSION} -${SITE_COMPILER_NAME} " )
43+ ## machine name provided
44+ ## --------------------------
45+ if (CMAKE_HOST_UNIX )
46+ set (CTEST_BUILD_NAME "${SITE_OS_NAME} -${SITE_OS_VERSION} -${SITE_OS_BITS} -${SITE_COMPILER_NAME} -${SITE_COMPILER_VERSION} " )
47+ else ()
48+ set (CTEST_BUILD_NAME "${SITE_OS_NAME} -${SITE_OS_VERSION} -${SITE_COMPILER_NAME} " )
49+ endif ()
50+ endif ()
51+ if (SITE_BUILDNAME_SUFFIX)
52+ set (CTEST_BUILD_NAME "${SITE_BUILDNAME_SUFFIX} -${CTEST_BUILD_NAME} " )
4853 endif ()
49- endif ()
50- if (SITE_BUILDNAME_SUFFIX)
51- set (CTEST_BUILD_NAME "${SITE_BUILDNAME_SUFFIX} -${CTEST_BUILD_NAME} " )
5254endif ()
5355set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME} " )
5456
0 commit comments