From 5bcfecb6cc03b581afb12509b9b67d4ff0dd2f28 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Wed, 16 May 2012 03:58:34 +1000 Subject: [PATCH 1/3] Use ctest instead of custom target. --- CMakeLists.txt | 5 ++++- tests/CMakeLists.txt | 8 +------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e00f04d3..4692ebb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,10 @@ configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c add_subdirectory(taglib) add_subdirectory(bindings) -add_subdirectory(tests) +if(BUILD_TESTS) + enable_testing() + add_subdirectory(tests) +endif(BUILD_TESTS) add_subdirectory(examples) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 67b29581..79d19429 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,3 @@ -if(BUILD_TESTS) - INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../taglib ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit @@ -64,8 +62,4 @@ SET(test_runner_SRCS ADD_EXECUTABLE(test_runner ${test_runner_SRCS}) TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES}) -ADD_CUSTOM_TARGET(check - ./test_runner - DEPENDS test_runner -) -endif(BUILD_TESTS) +ADD_TEST(test_runner test_runner) From 52e96e48c521ad55a7a83fd87d138513d48e6ed9 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Wed, 16 May 2012 04:37:25 +1000 Subject: [PATCH 2/3] Install examples if built. --- examples/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 17d4bd6b..22f03d88 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -45,6 +45,12 @@ ADD_EXECUTABLE(strip-id3v1 strip-id3v1.cpp) TARGET_LINK_LIBRARIES(strip-id3v1 tag ) +INSTALL(TARGETS + tagreader tagreader_c tagwriter framelist strip-id3v1 + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} +) endif(BUILD_EXAMPLES) From b5ad68d64be89db68069805925dc94f3cd403932 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 17 May 2012 03:42:36 +1000 Subject: [PATCH 3/3] Add custom 'check' target that depends on the test_runner target for backwards compatibility. --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 79d19429..2c2f0df5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -63,3 +63,5 @@ ADD_EXECUTABLE(test_runner ${test_runner_SRCS}) TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES}) ADD_TEST(test_runner test_runner) +ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} -V + DEPENDS test_runner)