diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-01-07 18:03:17 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-01-07 18:03:17 +0000 |
| commit | 1a6ea17bbf767bbbd5d6da50c1007f1278833e19 (patch) | |
| tree | 2be00b875d361ec8fc78abe348894e04247bd01a | |
| parent | 1a13270970c4194a0f3c306c0a9bb8e72e42c1fd (diff) | |
| download | qmmp-1a6ea17bbf767bbbd5d6da50c1007f1278833e19.tar.gz qmmp-1a6ea17bbf767bbbd5d6da50c1007f1278833e19.tar.bz2 qmmp-1a6ea17bbf767bbbd5d6da50c1007f1278833e19.zip | |
fixed build regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9620 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/General/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 90fcdd824..254c819f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,8 @@ find_package(Qt5X11Extras 5.4.0) find_package(Qt5DBus 5.4.0) find_package(Qt5Multimedia 5.4.0) find_package(Qt5Sql 5.4.0) -find_package(QtWinExtras 5.4.0) +find_package(Qt5WinExtras 5.4.0) +find_package(Qt5Concurrent 5.4.0) ADD_DEFINITIONS(-DQMMP_WS_X11 -DQT_DISABLE_DEPRECATED_BEFORE=0x050400 -DQT_DEPRECATED_WARNINGS) set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) @@ -231,7 +232,7 @@ PRINT_SUMMARY ("Track change .........................." USE_TRACKCHANGE 1) PRINT_SUMMARY ("Copy/Paste ............................" USE_COPYPASTE 1) PRINT_SUMMARY ("History plugin ........................" USE_HISTORY Qt5Sql_FOUND) PRINT_SUMMARY ("Sleep mode inhibition plugin .........." USE_SLEEPINHIBITOR Qt5DBus_FOUND) -PRINT_SUMMARY ("Media library plugin .................." USE_LIBRARY 1) +PRINT_SUMMARY ("Media library plugin .................." USE_LIBRARY Qt5Concurrent_FOUND) PRINT_SUMMARY ("Taskbar plugin (Windows) .............." USE_TASKBAR Qt5WinExtras_FOUND) PRINT_SUMMARY ("Removable device detection (Windows) .." USE_RDETECT Qt5WinExtras_FOUND) diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt index 38ee086b9..0b9528952 100644 --- a/src/plugins/General/CMakeLists.txt +++ b/src/plugins/General/CMakeLists.txt @@ -110,6 +110,6 @@ IF(USE_RDETECT AND Qt5WinExtras_FOUND) add_subdirectory(rdetect) ENDIF(USE_RDETECT AND Qt5WinExtras_FOUND) -IF(USE_LIBRARY) -add_directory(library) -ENDIF(USE_LIBRARY) +IF(USE_LIBRARY AND Qt5Concurrent_FOUND) +add_subdirectory(library) +ENDIF(USE_LIBRARY AND Qt5Concurrent_FOUND) |