[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-412-gbfbed2a
Kitware Robot
kwrobot at kitware.com
Wed Mar 8 09:25:02 EST 2017
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 bfbed2a2a8c10107c2279359572c11636c26bd76 (commit)
via 7e8b08ec6446649c9bcf4e48ff7810f4a0379bbe (commit)
via 0f5e76df0cc97808f7dacdeb4376fe249af6c919 (commit)
from 0a312e2271710554f8e73518dc4b28bd1d0d1d7a (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=bfbed2a2a8c10107c2279359572c11636c26bd76
commit bfbed2a2a8c10107c2279359572c11636c26bd76
Merge: 0a312e2 7e8b08e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 8 14:16:00 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 8 09:16:03 2017 -0500
Stage topic 'CheckLanguage-platform-toolset'
Topic-id: 22929
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/565
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e8b08ec6446649c9bcf4e48ff7810f4a0379bbe
commit 7e8b08ec6446649c9bcf4e48ff7810f4a0379bbe
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 8 09:12:09 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 8 09:12:09 2017 -0500
Tests: Pass generator platform and toolset into check for Fortran
Check for a Fortran compiler that supports the same target platform
as we are testing.
diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index 93990ad..b1652ba 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -18,6 +18,8 @@ file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
execute_process(
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CheckFortran
COMMAND ${CMAKE_COMMAND} . -G ${CMAKE_GENERATOR}
+ -A "${CMAKE_GENERATOR_PLATFORM}"
+ -T "${CMAKE_GENERATOR_TOOLSET}"
OUTPUT_VARIABLE output
ERROR_VARIABLE output
RESULT_VARIABLE result
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5e76df0cc97808f7dacdeb4376fe249af6c919
commit 0f5e76df0cc97808f7dacdeb4376fe249af6c919
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 8 09:10:45 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 8 09:10:45 2017 -0500
CheckLanguage: Pass generator platform and toolset into check
Otherwise we do not check for support for the language with the same
generator settings as the caller.
diff --git a/Modules/CheckLanguage.cmake b/Modules/CheckLanguage.cmake
index 6b4a9e4..1ea91d2 100644
--- a/Modules/CheckLanguage.cmake
+++ b/Modules/CheckLanguage.cmake
@@ -46,6 +46,8 @@ file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
execute_process(
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}
COMMAND ${CMAKE_COMMAND} . -G ${CMAKE_GENERATOR}
+ -A "${CMAKE_GENERATOR_PLATFORM}"
+ -T "${CMAKE_GENERATOR_TOOLSET}"
OUTPUT_VARIABLE output
ERROR_VARIABLE output
RESULT_VARIABLE result
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckLanguage.cmake | 2 ++
Tests/CheckFortran.cmake | 2 ++
2 files changed, 4 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list