[Xfce4-commits] <xfc:master> relocate core package detection

[Bo Lorentsen]

Updating branch refs/heads/master
         to 65fa1a33167b2499aeb883ded0bc3c2d367b01e7 (commit)
       from ab4fca14b3f4e15df6299d524bbe5053fd507265 (commit)

commit 65fa1a33167b2499aeb883ded0bc3c2d367b01e7
Author: Bo Lorentsen <bl at lue.dk>
Date:   Sun Jan 1 00:25:23 2012 +0100

    relocate core package detection

 CMakeLists.txt      |   13 +++++++++----
 core/CMakeLists.txt |    6 ------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d26ed8..fa20003 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,11 @@ PROJECT(XFC)
 
 INCLUDE(FindPkgConfig)
 
+PKG_SEARCH_MODULE(GLIB REQUIRED glib-2.0) 
+PKG_SEARCH_MODULE(SIGC REQUIRED sigc++-2.0)
+PKG_SEARCH_MODULE(GOBJ REQUIRED gobject-2.0)
+PKG_SEARCH_MODULE(GMOD REQUIRED gmodule-2.0) 
+PKG_SEARCH_MODULE(GTHR REQUIRED gthread-2.0)
 PKG_SEARCH_MODULE(GTK REQUIRED gtk+-2.0)
 PKG_SEARCH_MODULE(GTK_PRN gtk+-unix-print-2.0)
 PKG_SEARCH_MODULE(GDK REQUIRED gdk-2.0 )
@@ -11,10 +16,10 @@ PKG_SEARCH_MODULE(SIGC REQUIRED sigc++-2.0)
 PKG_SEARCH_MODULE(PANGO REQUIRED pango)
 PKG_SEARCH_MODULE(CAIRO REQUIRED cairo)
 PKG_SEARCH_MODULE(SOURCEVIEW gtksourceview-1.0)
-PKG_SEARCH_MODULE(XFCE_PANEL libxfce4panel-1.0 )
-PKG_SEARCH_MODULE(XFCE_UTILS libxfce4util-1.0 )
-PKG_SEARCH_MODULE(XFCE_UI libxfce4ui-1 )
-PKG_SEARCH_MODULE(XFCE_CONF libxfconf-0 )
+PKG_SEARCH_MODULE(XFCE_PANEL libxfce4panel-1.0)
+PKG_SEARCH_MODULE(XFCE_UTILS libxfce4util-1.0)
+PKG_SEARCH_MODULE(XFCE_UI libxfce4ui-1)
+PKG_SEARCH_MODULE(XFCE_CONF libxfconf-0)
 PKG_SEARCH_MODULE(GLADE libglade-2.0)
 
 IF(PANGO_FOUND)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index ed9c382..24309bf 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,11 +1,5 @@
 PROJECT( XFC_CORE )
 
-pkg_search_module( GLIB REQUIRED glib-2.0) 
-pkg_search_module( SIGC REQUIRED sigc++-2.0)
-pkg_search_module( GOJB REQUIRED gobject-2.0)
-pkg_search_module( GMOD REQUIRED gmodule-2.0) 
-pkg_search_module( GTHR REQUIRED gthread-2.0)
-
 ADD_SUBDIRECTORY( xfc )
 
 CONFIGURE_FILE( xfccore.pc.in xfccore-${XFC_VERSION}.pc @ONLY )