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

List:       kde-commits
Subject:    [kdepim] /: Move check on top (will use in kmail)
From:       Montel Laurent <montel () kde ! org>
Date:       2012-11-03 10:19:52
Message-ID: 20121103101952.2E60BA6091 () git ! kde ! org
[Download RAW message or body]

Git commit cf7e31719744ae3a1f4e7497038de1a24081ab3a by Montel Laurent.
Committed on 03/11/2012 at 11:19.
Pushed by mlaurent into branch 'master'.

Move check on top (will use in kmail)

M  +5    -0    CMakeLists.txt
M  +0    -6    messagecomposer/CMakeLists.txt

http://commits.kde.org/kdepim/cf7e31719744ae3a1f4e7497038de1a24081ab3a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cdc786..101631b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,6 +212,11 @@ else()
   find_package(Grantlee QUIET NO_MODULE)
   macro_log_feature(Grantlee_FOUND "Grantlee" "The Grantlee Template Syste=
m" "http://www.gitorious.org/grantlee/pages/Home" FALSE "" "Templating and =
theming for KJots and KaddressBook." )
 =

+  set(GRANTLEE_GREATER_0_2)
+  if(${Grantlee_VERSION} VERSION_GREATER "0.2.0" )
+     set(GRANTLEE_GREATER_0_2 true)
+  endif()
+
   find_package(Nepomuk)
   macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http:=
//www.kde.org" TRUE "" "Nepomuk extends the search and tagging functionalit=
ies in KMail and Akonadi")
   find_package(NepomukCore)
diff --git a/messagecomposer/CMakeLists.txt b/messagecomposer/CMakeLists.txt
index 36822d4..5727628 100644
--- a/messagecomposer/CMakeLists.txt
+++ b/messagecomposer/CMakeLists.txt
@@ -10,12 +10,6 @@ include_directories(
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 =

-set(GRANTLEE_GREATER_0_2)
-if(${Grantlee_VERSION} VERSION_GREATER "0.2.0" )
-   set(GRANTLEE_GREATER_0_2 true)
-endif()
-
-
 add_subdirectory( tests )
 if(GRANTLEE_GREATER_0_2)
   add_definitions(-DGRANTLEE_GREATER_0_2)
[prev in list] [next in list] [prev in thread] [next in thread]