Merge topic 'cleanup-build-commands'

ef7c11e Tests: Fix standalone build of tests with nested projects

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(

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}")

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(