mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert r735160 and r735161, and set BUILD_TESTS to OFF if CppUnit is not found.

Browse Source 
CCMAIL:michael.pyne@kdemail.net


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@740071 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Lukáš Lalinský 2007-11-22 13:17:15 +00:00
parent 363dbf569f
commit 51a5ae46b1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ConfigureChecks.cmake
View File

@ -20,6 +20,9 @@ ELSE(ZLIB_FOUND)
SET(HAVE_ZLIB 0)
ENDIF(ZLIB_FOUND)
# Currently breaks CMake when CppUnit is not present.
#SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
#FIND_PACKAGE(CppUnit)
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
FIND_PACKAGE(CppUnit)
IF (NOT CPPUNIT_FOUND AND BUILD_TESTS)
MESSAGE(STATUS "CppUnit not found, disabling tests.")
SET(BUILD_TESTS OFF)
ENDIF(NOT CPPUNIT_FOUND AND BUILD_TESTS)

15
tests/CMakeLists.txt
View File

@ -21,15 +21,12 @@ SET(test_runner_SRCS
test_id3v2.cpp
)
# Fails without CppUnit. These can be uncommented (with an appropriate guard
# checking for CppUnit availability) after the CppUnit configure check has
# also been fixed).
#ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
#TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})
ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})
#ADD_CUSTOM_TARGET(check
# ./test_runner
# DEPENDS test_runner
#)
ADD_CUSTOM_TARGET(check
./test_runner
DEPENDS test_runner
)
endif(BUILD_TESTS)