From ad92bad30f078347776aabe9378c9069e64424a1 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 26 Dec 2009 16:35:22 +0000 Subject: 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 --- modules/FindSharedDesktopOntologies.cmake | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'modules') 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) -- cgit v1.2.1