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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Valentin Rusu <kde () rusu ! info>
Date:       2013-05-16 19:09:06
Message-ID: 20130516190906.DBCEBAC87A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1354934 by vrusu:

Fix OTR plugin compilation by requiring LibOTR 3.2.0 to 4.0.0

 M  +2 -2      CMakeLists.txt  
 M  +3 -3      cmake/modules/FindLibOTR.cmake  


--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #1354933:1354934
@@ -88,9 +88,9 @@
 
 # LibOTR 4 have undergone significant changes leading to compilation errors, so this \
plugin should be disabled to let kopete compile (quick fix)  # TODO: fix otr plugin \
                to make it work sith LibOTR 4
-# macro_optional_find_package(LibOTR)
+macro_optional_find_package(LibOTR)
 macro_bool_to_01(LIBOTR_FOUND HAVE_LIBOTR)
-macro_log_feature(LIBOTR_FOUND "libotr" "A library to encrypt messages with \
Off-the-Record encryption" "http://www.cypherpunks.ca/otr" FALSE "3.2.0" "Required \
for the Kopete otr plugin.") +macro_log_feature(LIBOTR_FOUND "libotr" "A library to \
encrypt messages with Off-the-Record encryption (versions 3.2.0 to 4.0.0)" \
"http://www.cypherpunks.ca/otr" FALSE "3.2.0" "Required for the Kopete otr plugin.")  \
  macro_optional_find_package(Libmsn)
 macro_bool_to_01(LIBMSN_FOUND HAVE_LIBMSN)
--- trunk/KDE/kdenetwork/kopete/cmake/modules/FindLibOTR.cmake #1354933:1354934
@@ -23,14 +23,14 @@
   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION \
"${output}")  STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION \
"${LIBOTR_VERSION}")  # Check if version is at least 3.2.0
-  MACRO_ENSURE_VERSION("3.2.0" ${LIBOTR_VERSION} LIBOTR_FOUND)
+  MACRO_ENSURE_VERSION_RANGE("3.2.0" ${LIBOTR_VERSION} "4.0.0" LIBOTR_FOUND)
 
   IF( LIBOTR_FOUND )
     IF( NOT LIBOTR_FIND_QUIETLY )
-      MESSAGE( STATUS "Found libotr: ${LIBOTR_LIBRARY}")
+      MESSAGE( STATUS "Found libotr: ${LIBOTR_LIBRARY} (version ${LIBOTR_VERSION})")
     ENDIF( NOT LIBOTR_FIND_QUIETLY )
   ELSE( LIBOTR_FOUND )
-    MESSAGE(STATUS "libotr version 3.2.0 or greater required but found \
${LIBOTR_VERSION}.") +    MESSAGE(STATUS "libotr version between 3.2.0 and 4.0.0 \
required but found ${LIBOTR_VERSION}.")  ENDIF( LIBOTR_FOUND )
 
 ENDIF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )


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