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

List:       kde-commits
Subject:    kdereview/plasma/applets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-11-24 20:22:43
Message-ID: 1259094163.055994.16230.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1053794 by aseigo:

fix up the cmake files


 M  +11 -7     CMakeLists.txt  
 M  +0 -10     kimpanel/CMakeLists.txt  


--- trunk/kdereview/plasma/applets/CMakeLists.txt #1053793:1053794
@@ -1,10 +1,14 @@
-find_package(SCIM)
-if ( Q_WS_X11 )
-        if( SCIM_FOUND)
-             add_subdirectory(kimpanel)
-        endif ( SCIM_FOUND)
-
-endif ( Q_WS_X11 )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} \
${CMAKE_CURRENT_SOURCE_DIR}/kimpanel/cmake) +if (Q_WS_X11)
+   message("got x11")
+   if (X11_Xrender_FOUND)
+      find_package(SCIM)
+      macro_log_feature(SCIM_FOUND "SCIM headers" "Multibyte input widget" \
"http://www.scim-im.org" FALSE "1.4" "Needed for the kimpanel multibyte input \
Plasmoid") +      if (SCIM_FOUND)
+         add_subdirectory(kimpanel)
+      endif ( SCIM_FOUND)
+   endif (X11_Xrender_FOUND)
+endif (Q_WS_X11)
 add_subdirectory(kdeobservatory)
 add_subdirectory(adjustableclock)
 add_subdirectory(spellcheck)
--- trunk/kdereview/plasma/applets/kimpanel/CMakeLists.txt #1053793:1053794
@@ -1,14 +1,4 @@
-project(kimpanel)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-find_package(X11 REQUIRED)
-if (NOT X11_Xrender_FOUND)
-   message(FATAL "Xrender library not found")
-endif (NOT X11_Xrender_FOUND)
-
-find_package(KDE4 REQUIRED)
-
-include(KDE4Defaults)
 include_directories(${KDE4_INCLUDES} 
    ${PLASMA_INCLUDE_DIR} 
    ${X11_INCLUDE_DIR}


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