From 0f5e76df0cc97808f7dacdeb4376fe249af6c919 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Mar 2017 09:10:45 -0500 Subject: 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. --- Modules/CheckLanguage.cmake | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v0.12 From 7e8b08ec6446649c9bcf4e48ff7810f4a0379bbe Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Mar 2017 09:12:09 -0500 Subject: 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. --- Tests/CheckFortran.cmake | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v0.12