SVN commit 1185624 by aacid: do not die at cmake time when qca2 or kdebase workspace are not installed CCMAIL: plasma-devel@kde.org
M +6 -1 CMakeLists.txt M +6 -2 applets/CMakeLists.txt M +2 -0 dataengines/CMakeLists.txt M +0 -2 dataengines/microblog/CMakeLists.txt M +2 -2 libs/CMakeLists.txt --- trunk/KDE/kdeplasma-addons/CMakeLists.txt #1185623:1185624 @@ -7,7 +7,12 @@ include(MacroLibrary) include(MacroOptionalDependPackage) -find_package(KDE4Workspace REQUIRED) +macro_optional_find_package(KDE4Workspace) +macro_log_feature(KDE4WORKSPACE_FOUND "kdebase workspace" "KDE base workspace libraries" "http://www.kde.org"; FALSE "" "Needed for building several Plasma plugins") + +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 building microblog dataengine") + macro_optional_find_package(KdepimLibs) macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org"; FALSE "" "Needed for building several Plasma plugins") find_package(Boost) --- trunk/KDE/kdeplasma-addons/applets/CMakeLists.txt #1185623:1185624 @@ -9,7 +9,11 @@ endif(KDE4_PLASMA_OPENGL_FOUND) add_subdirectory(bball) +if(KDE4WORKSPACE_FOUND) add_subdirectory(binary-clock) + add_subdirectory(fuzzy-clock) + add_subdirectory(weather) +endif(KDE4WORKSPACE_FOUND) add_subdirectory(blackboard) add_subdirectory(bookmarks) add_subdirectory(bubblemon) @@ -19,7 +23,6 @@ add_subdirectory(fifteenPuzzle) add_subdirectory(fileWatcher) add_subdirectory(frame) -add_subdirectory(fuzzy-clock) add_subdirectory(kolourpicker) add_subdirectory(konqprofiles) add_subdirectory(konsoleprofiles) @@ -46,7 +49,6 @@ add_subdirectory(unitconverter) add_subdirectory(weatherstation) -add_subdirectory(weather) if(QT_QTWEBKIT_FOUND) add_subdirectory(dict) @@ -71,7 +73,9 @@ endif( Qwt5-Qt4_FOUND ) if(NOT WIN32) + if(KDE4WORKSPACE_FOUND) add_subdirectory(lancelot) + endif(KDE4WORKSPACE_FOUND) add_subdirectory(incomingmsg) add_subdirectory(leavenote) add_subdirectory(showdesktop) --- trunk/KDE/kdeplasma-addons/dataengines/CMakeLists.txt #1185623:1185624 @@ -1,5 +1,7 @@ add_subdirectory(comic) +if(QCA2_FOUND) add_subdirectory(microblog) +endif(QCA2_FOUND) if(LIBATTICA_FOUND) add_subdirectory(ocs) endif(LIBATTICA_FOUND) --- trunk/KDE/kdeplasma-addons/dataengines/microblog/CMakeLists.txt #1185623:1185624 @@ -1,5 +1,3 @@ -find_package(QCA2 REQUIRED) - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT_QTNETWORK_INCLUDES} ${QT_QTXML_INCLUDES} ${QCA2_INCLUDE_DIR}) --- trunk/KDE/kdeplasma-addons/libs/CMakeLists.txt #1185623:1185624 @@ -3,7 +3,7 @@ add_subdirectory(rtm) add_subdirectory(lancelot) -if(NOT WIN32) +if(NOT WIN32 AND KDE4WORKSPACE_FOUND) add_subdirectory(lancelot-datamodels) -endif(NOT WIN32) +endif(NOT WIN32 AND KDE4WORKSPACE_FOUND) _______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
