This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4835cb445ad64ee3ae9cc39dd87522446ff20e54 (commit)
via 6509ad29f6efab56ce2dd3669ca0fbf798adbee2 (commit)
from 8773905db61f266558ec0c949e0e05e11b7dd496 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4835cb445ad64ee3ae9cc39dd87522446ff20e54
commit 4835cb445ad64ee3ae9cc39dd87522446ff20e54
Merge: 8773905 6509ad2
Author: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Mon Jun 20 18:23:47 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 20 18:23:47 2016 -0400
Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler' into
next
6509ad29 CTest: Properly set buildname if only C langage is enabled
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6509ad29f6efab56ce2dd3669ca0fbf798adbee2
commit 6509ad29f6efab56ce2dd3669ca0fbf798adbee2
Author: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Mon Jun 20 15:45:25 2016 -0400
Commit: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
CommitDate: Mon Jun 20 15:45:25 2016 -0400
CTest: Properly set buildname if only C langage is enabled
Fixes #14068
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
-----------------------------------------------------------------------
Summary of changes:
Modules/CTest.cmake | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
