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

List:       kde-commits
Subject:    KDE/kdesdk
From:       Sebastian Doerner <sebastian () sebastian-doerner ! de>
Date:       2010-12-26 11:54:42
Message-ID: 20101226115442.4CE2BAC80E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209308 by doerner:

Make KDE-SDK's LibKonq dependency optional. Disable dolphin-plugins if LibKonq is not \
available.

Until now, building kdesdk without kdebase installed failed, because LibKonq was \
strictly required.

See http://lists.kde.org/?l=kde-core-devel&m=129155793026905&w=2


 M  +7 -1      CMakeLists.txt  


--- trunk/KDE/kdesdk/CMakeLists.txt #1209307:1209308
@@ -36,6 +36,9 @@
 macro_optional_find_package( QCA2 )
 macro_log_feature( QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" \
"http://delta.affinix.com/qca" FALSE "2.0.0" "Needed for most of the algorithms of \
the checksum tool in Okteta." )  
+macro_optional_find_package(LibKonq)
+macro_log_feature(LIBKONQ_FOUND "KDE-Base/LibKonq" "Provides high-level file \
management functions." "http://dolphin.kde.org/" FALSE "" "Required to build the \
Dolphin version control plugins.") +
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${KDEPIMLIBS_INCLUDE_DIR})  
@@ -50,8 +53,11 @@
   macro_optional_add_subdirectory(kdeaccounts-plugin)
 endif(KDEPIMLIBS_FOUND)
 
+if(LIBKONQ_FOUND)
+  macro_optional_add_subdirectory(dolphin-plugins)
+endif(LIBKONQ_FOUND)
+
 # kcachegrind is usable on Windows for XDebug etc.
-macro_optional_add_subdirectory(dolphin-plugins)
 macro_optional_add_subdirectory(kcachegrind)
 macro_optional_add_subdirectory(kate)
 macro_optional_add_subdirectory(kapptemplate)


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