aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmake
diff options
context:
space:
mode:
authorGravatar Christoph GrĂ¼ninger <foss@grueninger.de>2020-02-01 21:21:56 +0100
committerGravatar Christoph GrĂ¼ninger <gruenich@dune-project.org>2020-06-27 23:52:38 +0200
commitdc0b81fb1d39c88c73f2f628bc16b9676298f301 (patch)
treedb2d8d459604c0b7c8e45686d11eedf6843ae96d /cmake
parent13d25f5ed865c9033ece458fa3452b902327b6ff (diff)
Pass CMAKE_MAKE_PROGRAM to Fortran language support test
Otherwise the Make (or Ninja) program is used, which is installed system wide.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/language_support.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/language_support.cmake b/cmake/language_support.cmake
index fb462c747..591fca523 100644
--- a/cmake/language_support.cmake
+++ b/cmake/language_support.cmake
@@ -33,7 +33,7 @@ function(workaround_9220 language language_works)
file(WRITE ${CMAKE_BINARY_DIR}/language_tests/${language}/CMakeLists.txt
${text})
execute_process(
- COMMAND ${CMAKE_COMMAND} . -G "${CMAKE_GENERATOR}"
+ COMMAND ${CMAKE_COMMAND} . -G "${CMAKE_GENERATOR}" -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language}
RESULT_VARIABLE return_code
OUTPUT_QUIET
@@ -43,7 +43,7 @@ function(workaround_9220 language language_works)
if(return_code EQUAL 0)
# Second run
execute_process (
- COMMAND ${CMAKE_COMMAND} . -G "${CMAKE_GENERATOR}"
+ COMMAND ${CMAKE_COMMAND} . -G "${CMAKE_GENERATOR}" -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language}
RESULT_VARIABLE return_code
OUTPUT_QUIET