Commit cc9f6f3b authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'

6509ad29 CTest: Properly set buildname if only C langage is enabled
parents e260f30d 6509ad29
...@@ -224,16 +224,16 @@ if(BUILD_TESTING) ...@@ -224,16 +224,16 @@ if(BUILD_TESTING)
set(BUILD_NAME_SYSTEM_NAME "Win32") set(BUILD_NAME_SYSTEM_NAME "Win32")
endif() endif()
if(UNIX OR BORLAND) if(UNIX OR BORLAND)
get_filename_component(DART_CXX_NAME get_filename_component(DART_COMPILER_NAME
"${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT}) "${DART_COMPILER}" ${DART_NAME_COMPONENT})
else() else()
get_filename_component(DART_CXX_NAME get_filename_component(DART_COMPILER_NAME
"${CMAKE_MAKE_PROGRAM}" ${DART_NAME_COMPONENT}) "${CMAKE_MAKE_PROGRAM}" ${DART_NAME_COMPONENT})
endif() endif()
if(DART_CXX_NAME MATCHES "devenv") if(DART_COMPILER_NAME MATCHES "devenv")
GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_CXX_NAME) GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_COMPILER_NAME)
endif() endif()
set(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}") set(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_COMPILER_NAME}")
endif() endif()
# the build command # the build command
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment