FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for CMake 2.6

Browse Source 
No named arguments for add_test in CMake 2.6.
This commit is contained in:
Thomas Geymayer
2014-05-08 11:17:06 +02:00
parent 02ac1a43c1
commit 55f18574aa
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
CMakeModules/BoostTestTargets.cmake
View File

@@ -41,7 +41,7 @@ if(__add_boost_test)
endif()
set(__add_boost_test YES)
set(BOOST_TEST_TARGET_PREFIX "boosttest")
set(BOOST_TEST_TARGET_PREFIX "test")
if(NOT Boost_FOUND)
find_package(Boost 1.34.0 QUIET)
@@ -93,20 +93,6 @@ function(add_boost_test _name)
if(NOT BUILD_TESTING)
return()
endif()
# TODO check if 2.6 is enough
# if("${CMAKE_VERSION}" VERSION_LESS "2.8.0")
# if(NOT "${_boost_test_cmakever_pestered}x" EQUAL "${CMAKE_VERSION}x")
# message(STATUS
# "Not adding boost::test targets - CMake 2.8.0 or newer required, using ${CMAKE_VERSION}")
# set(_boost_test_cmakever_pestered
# "${CMAKE_VERSION}"
# CACHE
# INTERNAL
# ""
# FORCE)
# endif()
# return()
# endif()
# parse arguments
set(_nowhere)
@@ -239,12 +225,10 @@ function(add_boost_test _name)
if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
foreach(_test ${TESTS})
add_test(NAME
add_test(
${_name}-${_test}
COMMAND
${_test_command}
--run_test=${_test}
${Boost_TEST_FLAGS})
${_test_command} --run_test=${_test} ${Boost_TEST_FLAGS}
)
if(FAIL_REGULAR_EXPRESSION)
set_tests_properties(${_name}-${_test}
PROPERTIES
@@ -253,13 +237,12 @@ function(add_boost_test _name)
endif()
endforeach()
else()
add_test(NAME
add_test(
${_name}-boost_test
COMMAND
${_test_command}
${Boost_TEST_FLAGS})
${_test_command} ${Boost_TEST_FLAGS}
)
if(FAIL_REGULAR_EXPRESSION)
set_tests_properties(${_name}-${_test}
set_tests_properties(${_name}-boost_test
PROPERTIES
FAIL_REGULAR_EXPRESSION
"${FAIL_REGULAR_EXPRESSION}")