summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-10 18:09:22 (GMT)
committerBrad King <brad.king@kitware.com>2015-08-11 14:18:05 (GMT)
commitc180f0cbc224bf7f3fe9bcfdeea2d3c712c61084 (patch)
tree806fbf3566025b2f43008848e9818b4a11f5d204 /Tests
parent586b2e5e3633db1e1749dc2bdd69f6240b714139 (diff)
downloadCMake-c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084.zip
CMake-c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084.tar.gz
CMake-c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084.tar.bz2
Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test
Use the explicitly-tested make program, if any.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/FortranC/Flags.cmake.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/Tests/FortranC/Flags.cmake.in b/Tests/FortranC/Flags.cmake.in
index 2300fc6..cf361a5 100644
--- a/Tests/FortranC/Flags.cmake.in
+++ b/Tests/FortranC/Flags.cmake.in
@@ -12,11 +12,17 @@ configure_file("${src}/test_opt.sh.in" "${bld}/fc.sh" @ONLY)
set(ID)
set(COMMAND)
+set(make_program "@CMake_TEST_EXPLICIT_MAKE_PROGRAM@")
+if(make_program)
+ set(maybe_make_program "-DCMAKE_MAKE_PROGRAM=${make_program}")
+endif()
+
execute_process(
WORKING_DIRECTORY "${bld}"
COMMAND ${CMAKE_COMMAND} "${src}" -G "@CMAKE_GENERATOR@"
-A "@CMAKE_GENERATOR_PLATFORM@"
-T "@CMAKE_GENERATOR_TOOLSET@"
+ ${maybe_make_program}
"-DFortranC_TEST_FLAGS=1"
"-DCMAKE_C_COMPILER=${bld}/cc.sh"
"-DCMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@"