diff options
| author | David Faure <faure@kde.org> | 2010-11-15 22:43:44 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2010-11-15 22:43:44 +0000 |
| commit | 9fbdf0074b89a6f0e93b79e7e5ba1648365c97e3 (patch) | |
| tree | dba19e45381179ce8bd146a0656fafcdf0206893 | |
| parent | 04c6f67b0ebd9490fec82e330a704a616c28e536 (diff) | |
| download | extra-cmake-modules-9fbdf0074b89a6f0e93b79e7e5ba1648365c97e3.tar.gz extra-cmake-modules-9fbdf0074b89a6f0e93b79e7e5ba1648365c97e3.tar.bz2 | |
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
svn path=/trunk/KDE/kdelibs/; revision=1197457
| -rw-r--r-- | modules/FindNepomuk.cmake | 2 | ||||
| -rw-r--r-- | modules/FindSoprano.cmake | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 5a5b20f0..c09cf37f 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -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) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index e9d8ce36..77ddfe95 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -209,9 +209,10 @@ if(SOPRANO_INCLUDE_DIR) 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}) |