Default to native target ISA, always set build name

cmake/TestVecCore.cmake

@@ -67,22 +67,32 @@ if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
   endif()
 endif()
 
-if(NOT DEFINED CTEST_BUILD_NAME)
-  execute_process(COMMAND ${CMAKE_COMMAND} --system-information
-    OUTPUT_VARIABLE CMAKE_SYSTEM_INFORMATION ERROR_VARIABLE ERROR)
-  if(ERROR)
-    message(FATAL_ERROR "Could not detect default configuration")
-  endif()
-  string(REGEX REPLACE ".+CMAKE_CXX_COMPILER_ID \"([-0-9A-Za-z ]+)\".*$" "\\1"
-    COMPILER_ID "${CMAKE_SYSTEM_INFORMATION}")
-  string(REGEX REPLACE ".+CMAKE_CXX_COMPILER_VERSION \"([^\"]+)\".*$" "\\1"
-    COMPILER_VERSION "${CMAKE_SYSTEM_INFORMATION}")
-  set(CTEST_BUILD_NAME "${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}")
-  set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ${COMPILER_ID} ${COMPILER_VERSION}")
-  set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ${CTEST_CONFIGURATION_TYPE}")
-  set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ${CTEST_SCRIPT_ARG}")
+if(DEFINED CTEST_SCRIPT_ARG)
+  set(TARGET_ISA ${CTEST_SCRIPT_ARG})
+else()
+  set(TARGET_ISA Native)
+endif()
+
+set(CTEST_BUILD_NAME "${CMAKE_SYSTEM_NAME}")
+
+execute_process(COMMAND ${CMAKE_COMMAND} --system-information
+  OUTPUT_VARIABLE CMAKE_SYSTEM_INFORMATION ERROR_VARIABLE ERROR)
+
+if(ERROR)
+  message(FATAL_ERROR "Cannot detect system information")
 endif()
 
+string(REGEX REPLACE ".+CMAKE_CXX_COMPILER_ID \"([-0-9A-Za-z ]+)\".*$" "\\1"
+  COMPILER_ID "${CMAKE_SYSTEM_INFORMATION}")
+string(REPLACE "GNU" "GCC" COMPILER_ID "${COMPILER_ID}")
+
+string(REGEX REPLACE ".+CMAKE_CXX_COMPILER_VERSION \"([^\"]+)\".*$" "\\1"
+  COMPILER_VERSION "${CMAKE_SYSTEM_INFORMATION}")
+
+string(APPEND CTEST_BUILD_NAME " ${COMPILER_ID} ${COMPILER_VERSION}")
+string(APPEND CTEST_BUILD_NAME " ${CTEST_CONFIGURATION_TYPE}")
+string(APPEND CTEST_BUILD_NAME " ${TARGET_ISA}")
+
 set(CMAKE_ARGS
   -DBUILD_BENCHMARKS=ON
   -DBUILD_TESTING=ON
@@ -91,7 +101,7 @@ set(CMAKE_ARGS
   -DBUILD_UMESIMD=${UNIX}
   -DBUILD_VC=${UNIX}
   -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=${WIN32}
-  -DTARGET_ISA=${CTEST_SCRIPT_ARG}
+  -DTARGET_ISA=${TARGET_ISA}
   $ENV{CMAKE_ARGS}
   ${CMAKE_ARGS}
 )