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

List:       kde-commits
Subject:    [kdepim-runtime/frameworks] /: Fix compile kioslave
From:       Montel Laurent <montel () kde ! org>
Date:       2014-04-22 6:50:38
Message-ID: E1WcUXO-0007gg-EE () scm ! kde ! org
[Download RAW message or body]

Git commit 588be45e627d9351b6ffdb733513836a22ed65e2 by Montel Laurent.
Committed on 22/04/2014 at 06:50.
Pushed by mlaurent into branch 'frameworks'.

Fix compile kioslave

M  +12   -14   CMakeLists.txt
M  +10   -3    kioslave/CMakeLists.txt

http://commits.kde.org/kdepim-runtime/588be45e627d9351b6ffdb733513836a22ed65e2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b8d747..eb2f4d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,28 +5,26 @@ project(kdepim-runtime)
 # we need some parts of the ECM CMake helpers
 find_package (ECM 0.0.12 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${kdepim-runtime_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
-include(ECMOptionalAddSubdirectory)
-include(ECMInstallIcons)
-include(ECMSetupVersion)
-include(ECMAddTests)
-include(ECMMarkNonGuiExecutable)
-include(ECMGenerateHeaders)
 
-include(CMakePackageConfigHelpers)
+include(GenerateExportHeader)
+include(ECMGenerateHeaders)
+include(ECMGeneratePriFile)
+include(ECMPackageConfigHelpers)
+include(ECMSetupVersion)
 include(FeatureSummary)
-include(WriteBasicConfigVersionFile)
-include(CheckFunctionExists)
-
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings)
+include(KDEFrameworkCompilerSettings)
 
 set(KF5_VERSION "4.98.0")
 set(QT_REQUIRED_VERSION "5.2.0")
 
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Test)
-find_package(KF5Akonadi CONFIG REQUIRED)
+
+set(AkonadiServer_MIN_VERSION "1.70.41")
+find_package(Akonadi ${AkonadiServer_MIN_VERSION} CONFIG REQUIRED)
+
 
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, \
which are normally disabled. Also, it disables many components not needed for Kontact \
such as the Kolab client." FALSE)  
@@ -41,7 +39,7 @@ add_subdirectory(resources)
 #add_subdirectory(accountwizard)
 add_subdirectory(defaultsetup)
 #add_subdirectory(resourcetester)
-#add_subdirectory(kioslave)
+add_subdirectory(kioslave)
 #add_subdirectory(kcm)
 #add_subdirectory(tray)
 #add_subdirectory(migration)
@@ -57,7 +55,7 @@ feature_summary(WHAT ALL
 )
 
 
-if (false)
+if (FALSE)
 ############### KDEPIM-Runtime version ################
 # KDEPIM_RUNTIME_VERSION
 # Version scheme: "x.y.z build".
diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt
index b26748e..1613cc0 100644
--- a/kioslave/CMakeLists.txt
+++ b/kioslave/CMakeLists.txt
@@ -10,14 +10,21 @@ find_package(KF5Akonadi ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
 
-set(kio_akonadi_srcs akonadislave.cpp )
+set(kio_akonadi_SRCS akonadislave.cpp )
 
 
-add_library(kio_akonadi MODULE ${kio_akonadi_srcs})
+add_library(kio_akonadi MODULE ${kio_akonadi_SRCS})
 
 
 
-target_link_libraries(kio_akonadi  KF5::KDELibs4Support KF5::ItemModels KF5::KIOCore \
KF5::AkonadiCore ) +target_link_libraries(kio_akonadi  
+                      KF5::KDELibs4Support 
+                      KF5::ItemModels 
+                      KF5::KIOCore 
+                      KF5::AkonadiCore 
+                      Qt5::DBus
+                      Qt5::Widgets
+                      )
 
 install(TARGETS kio_akonadi DESTINATION ${PLUGIN_INSTALL_DIR} )
 


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