diff options
| author | Christophe Giboudeaux <cgiboudeaux@gmail.com> | 2009-12-26 16:35:22 +0000 |
|---|---|---|
| committer | Christophe Giboudeaux <cgiboudeaux@gmail.com> | 2009-12-26 16:35:22 +0000 |
| commit | ad92bad30f078347776aabe9378c9069e64424a1 (patch) | |
| tree | 0d21161b23356b9f29dba1b08c7a36793db0c44f | |
| parent | cb43713608b19412095db8f883fef4584aa592d4 (diff) | |
| download | extra-cmake-modules-ad92bad30f078347776aabe9378c9069e64424a1.tar.gz extra-cmake-modules-ad92bad30f078347776aabe9378c9069e64424a1.tar.bz2 | |
Fix FindSharedDesktopOntologies: Previously, if the required version wasn't found (mismatching _VERSION), this cmake file was looking for *any* version and set SHAREDDESKTOPONTOLOGIES_FOUND to true.
This also means kdelibs will now require SDO 0.2.
ack'ed by Alex.
svn path=/trunk/KDE/kdelibs/; revision=1066282
| -rw-r--r-- | modules/FindSharedDesktopOntologies.cmake | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/modules/FindSharedDesktopOntologies.cmake b/modules/FindSharedDesktopOntologies.cmake index c5b78fc9..2bca1df3 100644 --- a/modules/FindSharedDesktopOntologies.cmake +++ b/modules/FindSharedDesktopOntologies.cmake @@ -23,18 +23,9 @@ # First try the SharedDesktopOntologiesConfig.cmake from shared-desktop-ontologies 0.2 and newer find_package(SharedDesktopOntologies ${SharedDesktopOntologies_FIND_VERSION} QUIET NO_MODULE) -if (NOT SHAREDDESKTOPONTOLOGIES_ROOT_DIR) - # Look in the standard dirs - find_path (SHAREDDESKTOPONTOLOGIES_ROOT_DIR - nie/nie.trig - PATHS - ${SHARE_INSTALL_PREFIX} - ENV XDG_DATA_DIRS - PATH_SUFFIXES ontology share/ontology ) - -endif (NOT SHAREDDESKTOPONTOLOGIES_ROOT_DIR) - -mark_as_advanced(SHAREDDESKTOPONTOLOGIES_ROOT_DIR) +if (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) + mark_as_advanced(SHAREDDESKTOPONTOLOGIES_ROOT_DIR) +endif (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SharedDesktopOntologies DEFAULT_MSG SHAREDDESKTOPONTOLOGIES_ROOT_DIR) |