From c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 10 Aug 2015 14:09:22 -0400 Subject: [PATCH] Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test Use the explicitly-tested make program, if any. --- Tests/FortranC/Flags.cmake.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tests/FortranC/Flags.cmake.in b/Tests/FortranC/Flags.cmake.in index 2300fc61f..cf361a539 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@"