diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-09 15:50:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-09 15:50:52 (GMT) |
| commit | c0e46d42a35d9394d856b958e17d015f4b521940 (patch) | |
| tree | 703ee2047954ece9fc7a1c10dc48a7ea8619350f | |
| parent | dcbe8ad42bed8077ad23e1c521963f059ee6c584 (diff) | |
| parent | 7e8b08ec6446649c9bcf4e48ff7810f4a0379bbe (diff) | |
| download | CMake-c0e46d42a35d9394d856b958e17d015f4b521940.zip CMake-c0e46d42a35d9394d856b958e17d015f4b521940.tar.gz CMake-c0e46d42a35d9394d856b958e17d015f4b521940.tar.bz2 | |
Merge topic 'CheckLanguage-platform-toolset'
7e8b08ec Tests: Pass generator platform and toolset into check for Fortran
0f5e76df CheckLanguage: Pass generator platform and toolset into check
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !565
| -rw-r--r-- | Modules/CheckLanguage.cmake | 2 | ||||
| -rw-r--r-- | Tests/CheckFortran.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
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 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 |