Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-02-02 18:46:46 +01:00
Code Issues Releases Wiki Activity

Remove BUILD_TESTS cmake option

Browse Source
This commit is contained in:
Jonas Kvinge 2021-03-13 15:18:38 +01:00
parent d2385d9287
commit 9723c3606a
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -134,6 +134,8 @@ pkg_check_modules(LIBMTP libmtp>=1.0)
pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0) pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
find_package(Gettext) find_package(Gettext)
find_package(FFTW3) find_package(FFTW3)
find_package(GTest)
find_library(GMOCK_LIBRARY gmock)
if(NOT QT_DEFAULT_MAJOR_VERSION) if(NOT QT_DEFAULT_MAJOR_VERSION)
set(QT_DEFAULT_MAJOR_VERSION 5) set(QT_DEFAULT_MAJOR_VERSION 5)
@ -163,7 +165,7 @@ else()
endif() endif()
set(QT_COMPONENTS Core Concurrent Widgets Network Sql) set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
unset(OPTIONAL_COMPONENTS) set(QT_OPTIONAL_COMPONENTS Test)
if(QT_MAJOR_VERSION EQUAL 5) if(QT_MAJOR_VERSION EQUAL 5)
set(QT_MIN_VERSION 5.8) set(QT_MIN_VERSION 5.8)
@ -173,13 +175,13 @@ if(DBUS_FOUND AND NOT WIN32)
list(APPEND QT_COMPONENTS DBus) list(APPEND QT_COMPONENTS DBus)
endif() endif()
if(X11_FOUND) if(X11_FOUND)
list(APPEND OPTIONAL_COMPONENTS X11Extras) list(APPEND QT_OPTIONAL_COMPONENTS X11Extras)
endif() endif()
if(WIN32) if(WIN32)
list(APPEND OPTIONAL_COMPONENTS WinExtras) list(APPEND QT_OPTIONAL_COMPONENTS WinExtras)
endif() endif()
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${OPTIONAL_COMPONENTS}) find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
set(QtCore_LIBRARIES Qt${QT_MAJOR_VERSION}::Core) set(QtCore_LIBRARIES Qt${QT_MAJOR_VERSION}::Core)
set(QtConcurrent_LIBRARIES Qt${QT_MAJOR_VERSION}::Concurrent) set(QtConcurrent_LIBRARIES Qt${QT_MAJOR_VERSION}::Concurrent)
@ -203,6 +205,10 @@ if(Qt${QT_MAJOR_VERSION}WinExtras_FOUND)
list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras) list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
set(HAVE_WINEXTRAS ON) set(HAVE_WINEXTRAS ON)
endif() endif()
if(Qt${QT_MAJOR_VERSION}Test_FOUND)
set(QtTest_LIBRARIES Qt${QT_MAJOR_VERSION}::Test)
list(APPEND QT_LIBRARIES ${QtTest_LIBRARIES})
endif()
find_package(Qt${QT_MAJOR_VERSION} QUIET COMPONENTS LinguistTools CONFIG) find_package(Qt${QT_MAJOR_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND) if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND)
@ -426,11 +432,9 @@ if(HAVE_MOODBAR)
add_subdirectory(ext/gstmoodbar) add_subdirectory(ext/gstmoodbar)
endif() endif()
option(BUILD_TESTS "Build the test suite" OFF) if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
if(BUILD_TESTS)
add_subdirectory(tests) add_subdirectory(tests)
endif(BUILD_TESTS) endif()
# Uninstall support # Uninstall support
configure_file( configure_file(

11
tests/CMakeLists.txt
View File

@ -1,16 +1,5 @@
enable_testing() enable_testing()
if(BUILD_WITH_QT6)
find_package(Qt6 COMPONENTS Test REQUIRED)
set(QtTest_LIBRARIES Qt6::Test)
else()
find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Test REQUIRED)
set(QtTest_LIBRARIES ${Qt5Test_LIBRARIES})
endif()
find_package(GTest REQUIRED)
find_library(GMOCK_LIBRARY gmock REQUIRED)
add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1) add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1)
set(TESTUTILS-SOURCES set(TESTUTILS-SOURCES