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

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       David Faure <faure () kde ! org>
Date:       2010-11-15 22:43:45
Message-ID: 20101115224345.2A9AAAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197457 by dfaure:

Apply patch by Romain Perier: make the check for the min soprano version actually \
                work.
CCMAIL: kde-buildsystem@kde.org, romain.perier@gmail.com, sebastian@trueg.de


 M  +1 -1      FindNepomuk.cmake  
 M  +4 -3      FindSoprano.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindNepomuk.cmake #1197456:1197457
@@ -18,7 +18,7 @@
 
 
 if (NOT DEFINED Soprano_FOUND)
-  find_package(Soprano)
+  find_package(Soprano ${SOPRANO_MIN_VERSION})
   include(MacroLogFeature)
   macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" \
"http://soprano.sourceforge.net/" FALSE "" "Soprano is needed for Nepomuk")  endif \
                (NOT DEFINED Soprano_FOUND)
--- trunk/KDE/kdelibs/cmake/modules/FindSoprano.cmake #1197456:1197457
@@ -209,10 +209,11 @@
 endif(SOPRANO_INCLUDE_DIR)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Soprano DEFAULT_MSG 
-                                  SOPRANO_INCLUDE_DIR SOPRANO_LIBRARIES
-                                  ${_SOPRANO_REQUIRED_COMPONENTS_RESULTS} )
 
+find_package_handle_standard_args(Soprano REQUIRED_VARS SOPRANO_INCLUDE_DIR \
SOPRANO_LIBRARIES +                                                       \
_SOPRANO_REQUIRED_COMPONENTS_RESULTS  +                                         \
VERSION_VAR SOPRANO_VERSION) +
 # for compatibility:
 set(Soprano_FOUND ${SOPRANO_FOUND})
 


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