"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "third-party/cmake/BoostTestTargets.cmake" between
icinga2-2.11.5.tar.gz and icinga2-2.12.0.tar.gz

About: Icinga 2 is an enterprise grade monitoring system which keeps watch over networks and any conceivable network resource.

BoostTestTargets.cmake  (icinga2-2.11.5):BoostTestTargets.cmake  (icinga2-2.12.0)
skipping to change at line 50 skipping to change at line 50
if(__add_boost_test) if(__add_boost_test)
return() return()
endif() endif()
set(__add_boost_test YES) set(__add_boost_test YES)
set(BOOST_TEST_TARGET_PREFIX "boosttest") set(BOOST_TEST_TARGET_PREFIX "boosttest")
if(NOT Boost_FOUND) if(NOT Boost_FOUND)
find_package(Boost 1.34.0 QUIET) find_package(Boost 1.34.0 QUIET)
endif() endif()
if("${Boost_VERSION}0" LESS "1034000")
set(_shared_msg
"NOTE: boost::test-based targets and tests cannot "
"be added: boost >= 1.34.0 required but not found. "
"(found: '${Boost_VERSION}'; want >=103400) ")
if(BUILD_TESTING)
message(FATAL_ERROR
${_shared_msg}
"You may disable BUILD_TESTING to continue without the "
"tests.")
else()
message(STATUS
${_shared_msg}
"BUILD_TESTING disabled, so continuing anyway.")
endif()
endif()
include(GetForceIncludeDefinitions) include(GetForceIncludeDefinitions)
include(CopyResourcesToBuildTree) include(CopyResourcesToBuildTree)
if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000") if(Boost_FOUND)
set(_boosttesttargets_libs) set(_boosttesttargets_libs)
set(_boostConfig "BoostTestTargetsIncluded.h") set(_boostConfig "BoostTestTargetsIncluded.h")
if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY) if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
find_package(Boost 1.34.0 QUIET COMPONENTS unit_test_framework) find_package(Boost 1.34.0 QUIET COMPONENTS unit_test_framework)
endif() endif()
if(Boost_UNIT_TEST_FRAMEWORK_LIBRARY) if(Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
set(_boosttesttargets_libs "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}" ) set(_boosttesttargets_libs "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}" )
if(Boost_USE_STATIC_LIBS) if(Boost_USE_STATIC_LIBS)
set(_boostConfig "BoostTestTargetsStatic.h") set(_boostConfig "BoostTestTargetsStatic.h")
else() else()
skipping to change at line 147 skipping to change at line 131
if(_nowhere) if(_nowhere)
message(FATAL_ERROR "Syntax error in use of add_boost_test!") message(FATAL_ERROR "Syntax error in use of add_boost_test!")
endif() endif()
if(NOT SOURCES) if(NOT SOURCES)
message(FATAL_ERROR message(FATAL_ERROR
"Syntax error in use of add_boost_test: at least one sour ce file required!") "Syntax error in use of add_boost_test: at least one sour ce file required!")
endif() endif()
if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000") if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
set(includeType) set(includeType)
foreach(src ${SOURCES}) foreach(src ${SOURCES})
file(READ ${src} thefile) file(READ ${src} thefile)
if("${thefile}" MATCHES ".*BoostTestTargetConfig.h.*") if("${thefile}" MATCHES ".*BoostTestTargetConfig.h.*")
set(includeType CONFIGURED) set(includeType CONFIGURED)
set(includeFileLoc ${src}) set(includeFileLoc ${src})
break() break()
skipping to change at line 238 skipping to change at line 222
endif() endif()
# TODO: Figure out why only recent boost handles individual test running properly # TODO: Figure out why only recent boost handles individual test running properly
if(LAUNCHER) if(LAUNCHER)
set(_test_command ${LAUNCHER} "\$<TARGET_FILE:${_target_n ame}>") set(_test_command ${LAUNCHER} "\$<TARGET_FILE:${_target_n ame}>")
else() else()
set(_test_command ${_target_name}) set(_test_command ${_target_name})
endif() endif()
if(TESTS AND "${Boost_VERSION}" VERSION_GREATER "103799") if(TESTS)
foreach(_test ${TESTS}) foreach(_test ${TESTS})
add_test(NAME add_test(NAME
${_name}-${_test} ${_name}-${_test}
COMMAND COMMAND
${_test_command} ${_test_command}
--run_test=${_test} --run_test=${_test}
${Boost_TEST_FLAGS}) ${Boost_TEST_FLAGS})
if(FAIL_REGULAR_EXPRESSION) if(FAIL_REGULAR_EXPRESSION)
set_tests_properties(${_name}-${_test} set_tests_properties(${_name}-${_test}
PROPERTIES PROPERTIES
 End of changes. 4 change blocks. 
19 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)