mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Fix make test

Browse Source
This commit is contained in:
Dominik Schmidt
2014-08-21 12:10:48 +02:00
parent f8511152e3
commit ba9071753a
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -421,6 +421,11 @@ ADD_SUBDIRECTORY( thirdparty )
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( src )
ADD_SUBDIRECTORY( admin ) ADD_SUBDIRECTORY( admin )
IF(BUILD_TESTS)
enable_testing()
ADD_SUBDIRECTORY( src/tests )
ENDIF()
# Add all targets to the build-tree export set # Add all targets to the build-tree export set
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH "Installation directory for CMake files") set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH "Installation directory for CMake files")
set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}") set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")

2
src/CMakeLists.txt
View File

@@ -26,5 +26,3 @@ if(WITH_CRASHREPORTER)
add_subdirectory( crashreporter ) add_subdirectory( crashreporter )
endif() endif()
# tests
add_subdirectory( tests )

5
src/tests/CMakeLists.txt
View File

@@ -1,13 +1,8 @@
if( BUILD_TESTS )
setup_qt() setup_qt()
enable_testing()
include_directories(${CMAKE_CURRENT_LIST_DIR}/../src/tomahawk ${CMAKE_CURRENT_LIST_DIR}/../src/libtomahawk) include_directories(${CMAKE_CURRENT_LIST_DIR}/../src/tomahawk ${CMAKE_CURRENT_LIST_DIR}/../src/libtomahawk)
include(tomahawk_add_test.cmake) include(tomahawk_add_test.cmake)
tomahawk_add_test(Result) tomahawk_add_test(Result)
tomahawk_add_test(Query) tomahawk_add_test(Query)
tomahawk_add_test(Database) tomahawk_add_test(Database)
endif()