kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cleanup-build-commands'

Browse Source 
ef7c11e Tests: Fix standalone build of tests with nested projects
This commit is contained in:
Brad King 2013-12-06 15:52:41 -05:00 committed by CMake Topic Stage
commit 8ee6f3199a
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/ExportImport/CMakeLists.txt
View File

@ -1,5 +1,8 @@
cmake_minimum_required (VERSION 2.7.20090711) cmake_minimum_required (VERSION 2.7.20090711)
project(ExportImport C CXX) 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. # Wipe out the install tree to make sure the exporter works.
add_custom_command( add_custom_command(

4
Tests/Fortran/CMakeLists.txt
View File

@ -1,5 +1,9 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
project(testf C CXX Fortran) 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 ") message("CTEST_FULL_OUTPUT ")
set(CMAKE_VERBOSE_MAKEFILE 1) set(CMAKE_VERBOSE_MAKEFILE 1)
message("ENV_FLAGS = $ENV{FFLAGS}") message("ENV_FLAGS = $ENV{FFLAGS}")

4
Tests/MacRuntimePath/CMakeLists.txt
View File

@ -1,6 +1,8 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
project(MacRuntimePath) 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. # Wipe out the install tree to make sure the exporter works.
add_custom_command( add_custom_command(