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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2009-01-04 18:32:00
Message-ID: 1231093920.854257.13544.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 905630 by neundorf:

-find_package(Plasma) was unused here
-fix indentation

Alex




 M  +5 -5      CMakeLists.txt  
 M  +10 -6     quicklaunch/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/plasma/applets/CMakeLists.txt #905629:905630
@@ -11,12 +11,12 @@
 add_subdirectory(trash)
 
 if(QT_QTWEBKIT_FOUND)
-add_subdirectory(webbrowser)
+   add_subdirectory(webbrowser)
 endif(QT_QTWEBKIT_FOUND)
 
 if(NOT WIN32)
-add_subdirectory(pager)
-add_subdirectory(system-monitor)
-add_subdirectory(systemtray)
-add_subdirectory(tasks)
+   add_subdirectory(pager)
+   add_subdirectory(system-monitor)
+   add_subdirectory(systemtray)
+   add_subdirectory(tasks)
 endif(NOT WIN32)
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/CMakeLists.txt #905629:905630
@@ -1,11 +1,15 @@
 project(quicklaunch-applet)
-FIND_PACKAGE(KDE4 REQUIRED)
-FIND_PACKAGE(Plasma REQUIRED)
-INCLUDE_DIRECTORIES(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${KDE4_INCLUDES} 
-)
 
+# building separately or as part of kdebase ?
+if(NOT KDE4_FOUND)
+   find_package(KDE4 REQUIRED)
+
+   include_directories(
+   ${CMAKE_CURRENT_BINARY_DIR}
+   ${KDE4_INCLUDES} 
+   )
+endif(NOT KDE4_FOUND)
+
 set(plasma_applet_quicklaunch_SRCS
   quicklaunchApplet.cpp
   quicklaunchIcon.cpp
[prev in list] [next in list] [prev in thread] [next in thread]