From 619b1eaf54d722b7833b049eb13149112238b8ae Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 4 Oct 2006 15:12:47 +0000 Subject: [PATCH] Add tests directory into build git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@592361 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 3 +++ examples/CMakeLists.txt | 25 ------------------------- tests/CMakeLists.txt | 24 +++--------------------- 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b77f949..da928674 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ project(taglib) find_package(ZLIB) +OPTION(BUILD_TESTS "Create test" OFF) + #add some KDE specific stuff set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) @@ -20,6 +22,7 @@ configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) ADD_SUBDIRECTORY( taglib ) +ADD_SUBDIRECTORY(tests) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3e91a979..0efdf825 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -72,28 +72,3 @@ TARGET_LINK_LIBRARIES(strip-id3v1 tag ) INSTALL(PROGRAMS strip-id3v1 DESTINATION ${BIN_INSTALL_DIR}) - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#bin_PROGRAMS = tagreader tagreader_c tagwriter framelist strip-id3v1 -#tagreader_SOURCES = tagreader.cpp -#tagreader_c_SOURCES = tagreader_c.c -#tagwriter_SOURCES = tagwriter.cpp -#framelist_SOURCES = framelist.cpp -#strip_id3v1_SOURCES = strip-id3v1.cpp -# -#INCLUDES = \ -# -I$(top_srcdir)/taglib \ -# -I$(top_srcdir)/taglib/toolkit \ -# -I$(top_srcdir)/taglib/mpeg \ -# -I$(top_srcdir)/taglib/mpeg/id3v1 \ -# -I$(top_srcdir)/taglib/mpeg/id3v2 \ -# -I$(top_srcdir)/taglib/bindings/c -# -#LDADD = ../libtag.la -#tagreader_c_LDADD = ../bindings/c/libtag_c.la diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 35de0f36..8c323cf1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,32 +1,14 @@ +if(BUILD_TESTS) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/taglib ${CMAKE_SOURCE_DIR}/taglib/toolkit ${CMAKE_SOURCE_DIR}/taglib/mpeg/id3v2 ) ########### next target ############### SET(toolkit-test_SRCS -dummy.cpp + toolkit-test.cpp ) -FILE(WRITE dummy.cpp "//autogenerated file by cmake\n") ADD_EXECUTABLE(toolkit-test ${toolkit-test_SRCS}) TARGET_LINK_LIBRARIES(toolkit-test tag ) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#INCLUDES = \ -# -I$(top_srcdir)/taglib\ -# -I$(top_srcdir)/taglib/toolkit \ -# -I$(top_srcdir)/taglib/mpeg/id3v2 -# -#LDADD = ../libtag.la -# -#check_PROGRAMS = toolkit-test -# -#toolkit_test_SOURCES = toolkit-test.cpp +endif(BUILD_TESTS)