[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia
From:       Laurent Montel <montel () kde ! org>
Date:       2010-01-25 21:20:54
Message-ID: 1264454454.304572.26175.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1080207 by mlaurent:

Fix search cmake module
don't break compile if DiscId is not found


 M  +4 -3      CMakeLists.txt  
 M  +1 -1      kaudiocreator/CMakeLists.txt  


--- trunk/extragear/multimedia/CMakeLists.txt #1080206:1080207
@@ -1,6 +1,6 @@
 project(extragear-multimedia)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules \
${CMAKE_SOURCE_DIR}/kaudiocreator/cmake/modules/)  
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
@@ -11,6 +11,7 @@
 find_package(KdeMultimedia)
 find_package(OpenGL)
 find_package(Xine)
+find_package(DiscId)
 # are these two really required ?
 if (APPLE)
    find_package(Carbon REQUIRED)
@@ -30,9 +31,9 @@
 
 if(KDEMULTIMEDIA_FOUND)
    macro_optional_add_subdirectory(k3b)
-   if(TAGLIB_FOUND)
+   if(TAGLIB_FOUND AND DISCID_FOUND)
      macro_optional_add_subdirectory(kaudiocreator)
-   endif(TAGLIB_FOUND)
+   endif(TAGLIB_FOUND AND DISCID_FOUND)
 endif(KDEMULTIMEDIA_FOUND)
 macro_optional_add_subdirectory(kaffeine)
 macro_optional_add_subdirectory(kmid)
--- trunk/extragear/multimedia/kaudiocreator/CMakeLists.txt #1080206:1080207
@@ -2,7 +2,7 @@
 
 project(kaudiocreator)
 
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 find_package(KDE4 REQUIRED)
 find_package(KdeMultimedia REQUIRED)


[prev in list] [next in list] [prev in thread] [next in thread]