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

List:       kde-commits
Subject:    KDE/kdebase/apps
From:       Pino Toscano <pino () kde ! org>
Date:       2008-06-09 0:51:38
Message-ID: 1212972698.412758.19128.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 818618 by pino:

a bit hackish way to detect whether "apps" is compiled separately or within the whole \
kdebase; in the former case, just find Plasma, while in the latter "simulate" a \
successful behaviour of FindPlasma, setting all the variables to the plasma stuff in \
workspace


 M  +10 -1     CMakeLists.txt  


--- trunk/KDE/kdebase/apps/CMakeLists.txt #818617:818618
@@ -18,7 +18,16 @@
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/lib/konq ${CMAKE_BINARY_DIR} \
${KDE4_INCLUDES})  
-find_package(Plasma)
+if (EXISTS "${kdebase_SOURCE_DIR}")
+  # compiling kdebase as a whole, so Plasma is always there
+  set (PLASMA_FOUND TRUE)
+  set (PLASMA_INCLUDE_DIR ${kdebase_SOURCE_DIR}/workspace/libs)
+  set (PLASMA_LIBS plasma)
+  set (PLASMA_OPENGL_FOUND ${PLASMA_INCLUDE_DIR}/plasma/glapplet.h)
+else (EXISTS "${kdebase_SOURCE_DIR}")
+  # compiling kdebase-apps separately, look for already an installed Plasma
+  find_package(Plasma)
+endif (EXISTS "${kdebase_SOURCE_DIR}")
 
 add_subdirectory( lib )
 add_subdirectory( dolphin )


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