diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/General/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/Input/CMakeLists.txt | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f78bcf8e..5055115ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,7 +151,7 @@ PRINT_SUMMARY ("Global hotkey support ............." USE_HOTKEY X11_FOUND) PRINT_SUMMARY ("File operations ..................." USE_FILEOPS 1) PRINT_SUMMARY ("Cover manager ....................." USE_COVER 1) PRINT_SUMMARY ("KDE4 notifications support ........" USE_KDENOTIFY 1) -PRINT_SUMMARY ("Audio converter ..................." USE_CONVERTER 1) +PRINT_SUMMARY ("Audio converter ..................." USE_CONVERTER TAGLIB_FOUND) MESSAGE("") MESSAGE("File Dialogs:") diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 83328daf0..37542f3bc 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,6 +1,7 @@ SET(USE_ENCA TRUE CACHE BOOL "enable/disable libenca support") include(FindPkgConfig) pkg_search_module(ENCA enca>=1.9) +pkg_search_module(TAGLIB taglib) add_subdirectory(Input) add_subdirectory(Output) add_subdirectory(Visual) diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt index 0ccf00b0a..136b4c156 100644 --- a/src/plugins/General/CMakeLists.txt +++ b/src/plugins/General/CMakeLists.txt @@ -55,6 +55,6 @@ IF(USE_KDENOTIFY) add_subdirectory(kdenotify) ENDIF(USE_KDENOTIFY) -IF(USE_CONVERTER) +IF(USE_CONVERTER AND TAGLIB_FOUND) add_subdirectory(converter) -ENDIF(USE_CONVERTER) +ENDIF(USE_CONVERTER AND TAGLIB_FOUND) diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index d49cf7379..ed57dcd17 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -1,6 +1,4 @@ -INCLUDE(FindPkgConfig) - SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin") SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin") SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin") @@ -15,7 +13,6 @@ SET(USE_CDA TRUE CACHE BOOL "enable/disable cd audio support") SET(USE_MIDI TRUE CACHE BOOL "enable/disable midi support") SET(USE_GME TRUE CACHE BOOL "enable/disable game music plugin") -pkg_check_modules(TAGLIB taglib) IF(USE_MAD AND TAGLIB_FOUND) add_subdirectory(mad) |