From 6fbc4993b5cea9863ad2d5b3645c0fe646c6e304 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 7 Oct 2011 20:14:14 +0000 Subject: fixed cmake scripts git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2385 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/CMakeLists.txt | 1 + src/plugins/General/CMakeLists.txt | 4 ++-- src/plugins/Input/CMakeLists.txt | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins') 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) -- cgit v1.2.3-13-gbd6f