grim/guifications3

added a macro for adding tests to gflib.cmake (this will need to be made expandable later)

2011-05-17, Gary Kramlich
462fdf322292
Parents 13ff35d0d7f7
Children bd46fc08a57c
added a macro for adding tests to gflib.cmake (this will need to be made expandable later)
moved testing from ctest to part of the normal build
2 files changed, 19 insertions(+), 8 deletions(-)
  • +14 -0
    gflib/cmake/Modules/gflib.cmake
  • +5 -8
    gflib/tests/CMakeLists.txt
    • --- a/gflib/cmake/Modules/gflib.cmake Tue May 17 23:02:16 2011 -0500
    +++ b/gflib/cmake/Modules/gflib.cmake Tue May 17 23:31:01 2011 -0500
    @@ -122,3 +122,17 @@
    DESTINATION lib/pkgconfig
    )
    endmacro(GFLIB_LIBRARY_PROJECT)
    +
    +macro(GFLIB_ADD_TEST target)
    + add_executable(${target} ${target}.c)
    + target_link_libraries(${target} ${GLIB_LIBRARIES} gflib)
    +
    + get_target_property(_output_name ${target} RUNTIME_OUTPUT_NAME)
    + if(${_output_name})
    + else(${_output_name})
    + get_target_property(_output_name ${target} LOCATION)
    + endif(${_output_name})
    +
    + list(APPEND TESTS ${_output_name})
    +endmacro(GFLIB_ADD_TEST)
    +
    --- a/gflib/tests/CMakeLists.txt Tue May 17 23:02:16 2011 -0500
    +++ b/gflib/tests/CMakeLists.txt Tue May 17 23:31:01 2011 -0500
    @@ -1,13 +1,10 @@
    -enable_testing()
    -
    -add_executable(testlog testlog.c)
    -target_link_libraries(testlog ${GLIB_LIBRARIES} gflib)
    -list(APPEND TESTS testlog)
    +GFLIB_ADD_TEST(testlog)
    set(GTESTER_TESTS "${TESTS}")
    +set(GTESTER_LOG "testgflib.log")
    -add_test(gflib-tests
    - ${GTESTER} -k --verbose -o testgflib.log
    - ${GTESTER_TESTS}
    +add_custom_target(tests ALL
    + COMMAND ${GTESTER} -k --verbose -o ${GTESTER_LOG} ${GTESTER_TESTS}
    + DEPENDS ${GTESTER_TESTS}
    )