diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-21 17:57:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-21 17:57:14 (GMT) |
| commit | cc9f6f3b98e6ebbb63b746ed66141515cb16ed3c (patch) | |
| tree | aa66971fc6de7344edadb62ac7d787f96b139c89 | |
| parent | e260f30d23b3fd89fc7f47603adde3dc03d21601 (diff) | |
| parent | 6509ad29f6efab56ce2dd3669ca0fbf798adbee2 (diff) | |
| download | CMake-cc9f6f3b98e6ebbb63b746ed66141515cb16ed3c.zip CMake-cc9f6f3b98e6ebbb63b746ed66141515cb16ed3c.tar.gz CMake-cc9f6f3b98e6ebbb63b746ed66141515cb16ed3c.tar.bz2 | |
Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'
6509ad29 CTest: Properly set buildname if only C langage is enabled
| -rw-r--r-- | Modules/CTest.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index a27eb4b..ce725c5 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -224,16 +224,16 @@ if(BUILD_TESTING) set(BUILD_NAME_SYSTEM_NAME "Win32") endif() if(UNIX OR BORLAND) - get_filename_component(DART_CXX_NAME - "${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT}) + get_filename_component(DART_COMPILER_NAME + "${DART_COMPILER}" ${DART_NAME_COMPONENT}) else() - get_filename_component(DART_CXX_NAME + get_filename_component(DART_COMPILER_NAME "${CMAKE_MAKE_PROGRAM}" ${DART_NAME_COMPONENT}) endif() - if(DART_CXX_NAME MATCHES "devenv") - GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_CXX_NAME) + if(DART_COMPILER_NAME MATCHES "devenv") + GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_COMPILER_NAME) endif() - set(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}") + set(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_COMPILER_NAME}") endif() # the build command |