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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-01-04 11:20:50
Message-ID: 1231068050.843036.13901.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 905359 by ossi:

move configure checks where they belong


 M  +0 -12     CMakeLists.txt  
 M  +11 -0     ConfigureChecks.cmake  


--- trunk/KDE/kdebase/workspace/kdm/CMakeLists.txt #905358:905359
@@ -5,18 +5,6 @@
 
 include(ConfigureChecks.cmake)
 
-macro_optional_find_package(CkConnector)
-if(CKCONNECTOR_FOUND)
-  # when building with libck-connector, we also need the low-level D-Bus API
-  find_package(DBus REQUIRED)
-endif(CKCONNECTOR_FOUND)
-
-macro_log_feature(CKCONNECTOR_FOUND "ck-connector" "The ConsoleKit connector \
library" "http://freedesktop.org/wiki/Software/ConsoleKit" FALSE "" "Provides \
                ConsoleKit integration in KDM")
-
-macro_bool_to_01(CKCONNECTOR_FOUND HAVE_CKCONNECTOR)
-
-configure_file(config-kdm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdm.h)
-
 install( FILES README DESTINATION ${DATA_INSTALL_DIR}/doc/kdm )
 
 set(confproc ${CMAKE_CURRENT_SOURCE_DIR}/confproc.pl)
--- trunk/KDE/kdebase/workspace/kdm/ConfigureChecks.cmake #905358:905359
@@ -1,3 +1,12 @@
+macro_optional_find_package(CkConnector)
+macro_bool_to_01(CKCONNECTOR_FOUND HAVE_CKCONNECTOR)
+if(CKCONNECTOR_FOUND)
+  # when building with libck-connector, we also need the low-level D-Bus API
+  find_package(DBus REQUIRED)
+endif(CKCONNECTOR_FOUND)
+
+macro_log_feature(CKCONNECTOR_FOUND "ck-connector" "The ConsoleKit connector \
library" "http://freedesktop.org/wiki/Software/ConsoleKit" FALSE "" "Provides \
ConsoleKit integration in KDM") +
 include(CheckCSourceRuns)
 include(CheckStructMember)
 
@@ -211,3 +220,5 @@
         STRING(SUBSTRING "${LIBEXEC_INSTALL_DIR}" ${ipsl} ${klxsfxl} \
KDM_LIBEXEC_SUFFIX)  endif (NOT inip)
 endif (NOT LIBEXEC_INSTALL_DIR STREQUAL "${BIN_INSTALL_DIR}")
+
+configure_file(config-kdm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdm.h)


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