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

List:       kde-commits
Subject:    playground/base/plasma/applets
From:       Sebastian Kügler <sebas () kde ! org>
Date:       2010-01-21 1:39:02
Message-ID: 1264037942.748263.24475.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1077867 by sebas:

build crystal again now that it lost all those weird dependencies

 M  +1 -11     CMakeLists.txt  
 M  +1 -4      crystal/CMakeLists.txt  


--- trunk/playground/base/plasma/applets/CMakeLists.txt #1077866:1077867
@@ -18,17 +18,6 @@
 macro_optional_add_subdirectory(cpufrequency-selector)
 macro_optional_add_subdirectory(togglepanel)
 
-macro_optional_depend_package(NEPOMUKQUERY "NepomukQuery")
-if(DEPEND_PACKAGE_NEPOMUKQUERY)
-   macro_optional_find_package(NepomukQuery)
-else(DEPEND_PACKAGE_NEPOMUKQUERY)
-   set(NEPOMUKQUERY_FOUND FALSE)
-endif(DEPEND_PACKAGE_NEPOMUKQUERY)
-
-if(NEPOMUKQUERY_FOUND)
-    macro_optional_add_subdirectory(crystal)
-endif(NEPOMUKQUERY_FOUND)
-
 FIND_PATH(PLASMACLOCK_INCLUDE
   NAMES
   ui_calendar.h
@@ -112,6 +101,7 @@
 
 find_package(Nepomuk)
 if (NEPOMUK_FOUND)
+    macro_optional_add_subdirectory(crystal)
     macro_optional_add_subdirectory(nepomuktags)
 endif (NEPOMUK_FOUND)
 
--- trunk/playground/base/plasma/applets/crystal/CMakeLists.txt #1077866:1077867
@@ -1,7 +1,5 @@
 project(plasma-crystal)
 
-set(SOPRANO_MIN_VERSION "2.1.64")
-find_package(Soprano REQUIRED)
 find_package(Nepomuk REQUIRED)
 
 set(crystal_SRCS
@@ -15,9 +13,8 @@
 target_link_libraries(
     plasma_applet_crystal
     ${KDE4_PLASMA_LIBS}
-    ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}
+    ${KDE4_KIO_LIBS}
     ${NEPOMUK_LIBRARIES}
-    ${SOPRANO_LIBRARIES}
 )
 
 install(TARGETS plasma_applet_crystal DESTINATION ${PLUGIN_INSTALL_DIR})
[prev in list] [next in list] [prev in thread] [next in thread]