From ef7c11ee31b371bd07bc32991a671da757602213 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 5 Dec 2013 12:44:32 -0500 Subject: [PATCH] Tests: Fix standalone build of tests with nested projects Since commit fd6076d0 (Tests: Pass CMAKE_MAKE_PROGRAM instead of --build-makeprogram, 2013-11-15) the ExportImport, Fortran, and MacRuntimePath tests use the value of CMAKE_TEST_MAKEPROGRAM as the CMAKE_MAKE_PROGRAM for their nested projects configurations. Teach these tests to initialize CMAKE_TEST_MAKEPROGRAM when it is not provided, such as when building the tests manually. --- Tests/ExportImport/CMakeLists.txt | 3 +++ Tests/Fortran/CMakeLists.txt | 4 ++++ Tests/MacRuntimePath/CMakeLists.txt | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt index 8be8d3392..02a0371f8 100644 --- a/Tests/ExportImport/CMakeLists.txt +++ b/Tests/ExportImport/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required (VERSION 2.7.20090711) project(ExportImport C CXX) +if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() # Wipe out the install tree to make sure the exporter works. add_custom_command( diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index 8f165ce99..adc4308c3 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required (VERSION 2.6) project(testf C CXX Fortran) +if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() + message("CTEST_FULL_OUTPUT ") set(CMAKE_VERBOSE_MAKEFILE 1) message("ENV_FLAGS = $ENV{FFLAGS}") diff --git a/Tests/MacRuntimePath/CMakeLists.txt b/Tests/MacRuntimePath/CMakeLists.txt index a87b41eef..5c7b921b7 100644 --- a/Tests/MacRuntimePath/CMakeLists.txt +++ b/Tests/MacRuntimePath/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 2.8) project(MacRuntimePath) - +if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() # Wipe out the install tree to make sure the exporter works. add_custom_command(