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

List:       kde-commits
Subject:    [kdepimlibs/frameworks] kimap: Find kmime before kf5
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2014-03-31 19:54:31
Message-ID: E1WUiHv-0006C4-Mb () scm ! kde ! org
[Download RAW message or body]

Git commit 16c76770da2ee7237229a510cde916d69c7f12ef by Christophe Giboudeau=
x.
Committed on 31/03/2014 at 19:11.
Pushed by cgiboudeaux into branch 'frameworks'.

Find kmime before kf5

M  +5    -5    kimap/CMakeLists.txt

http://commits.kde.org/kdepimlibs/16c76770da2ee7237229a510cde916d69c7f12ef

diff --git a/kimap/CMakeLists.txt b/kimap/CMakeLists.txt
index 29b3ac6..66bb9a7 100644
--- a/kimap/CMakeLists.txt
+++ b/kimap/CMakeLists.txt
@@ -25,6 +25,11 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KIMAP
 )
 =

 ########### Find packages ###########
+# FIXME: remove this if/endif when KMime is split.
+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+  find_package(KF5KMime ${KF5_VERSION} CONFIG REQUIRED)
+endif()
+
 find_package(KF5 ${KF5_VERSION} CONFIG REQUIRED COMPONENTS CoreAddons KDE4=
Support)
 =

 set(Boost_MINIMUM_VERSION "1.34.0")
@@ -42,11 +47,6 @@ set_package_properties(Sasl2 PROPERTIES
                              TYPE REQUIRED
 )
 =

-# FIXME: remove this if/endif when KMime is split.
-if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  find_package(KF5KMime ${KF5_VERSION} CONFIG REQUIRED)
-endif()
-
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Imap")
 =


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