From 14224f75231147cb4dd434d409e7ddca76c75040 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 30 Nov 2009 19:31:25 +0000 Subject: -find_package_handle_standard_args() already takes care of not printing the same message twice, so it's not necessary to set the QUIETLY -multiple suffixes can be listed after PATH_SUFFIXES, so it's not necessary to have two find_path() calls -/usr and /usr/local are already part of CMAKE_SYSTEM_PREFIX_PATH, so it's not necessary to set /usr/share and /usr/local/share explicitely (see CMake Modules/Platform/UnixPath.cmake) Alex CCMAIL: trueg@kde.org svn path=/trunk/KDE/kdelibs/; revision=1056761 --- modules/FindSharedDesktopOntologies.cmake | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'modules') diff --git a/modules/FindSharedDesktopOntologies.cmake b/modules/FindSharedDesktopOntologies.cmake index 073ca08f..c5b78fc9 100644 --- a/modules/FindSharedDesktopOntologies.cmake +++ b/modules/FindSharedDesktopOntologies.cmake @@ -19,10 +19,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) - # in cache already - set(SHAREDDESKTOPONTOLOGIES_FIND_QUIETLY TRUE) -endif (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) # First try the SharedDesktopOntologiesConfig.cmake from shared-desktop-ontologies 0.2 and newer find_package(SharedDesktopOntologies ${SharedDesktopOntologies_FIND_VERSION} QUIET NO_MODULE) @@ -32,16 +28,10 @@ if (NOT SHAREDDESKTOPONTOLOGIES_ROOT_DIR) find_path (SHAREDDESKTOPONTOLOGIES_ROOT_DIR nie/nie.trig PATHS - /usr/share - /usr/local/share ${SHARE_INSTALL_PREFIX} ENV XDG_DATA_DIRS - PATH_SUFFIXES ontology) + PATH_SUFFIXES ontology share/ontology ) - # Look in CMAKE_PREFIX_PATH - find_path(SHAREDDESKTOPONTOLOGIES_ROOT_DIR - nie/nie.trig - PATH_SUFFIXES share/ontology) endif (NOT SHAREDDESKTOPONTOLOGIES_ROOT_DIR) mark_as_advanced(SHAREDDESKTOPONTOLOGIES_ROOT_DIR) -- cgit v1.2.1