From 607257d3d0239e79ca8a7527af5025070a191276 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 May 2009 20:37:26 +0000 Subject: -simplify it Alex svn path=/trunk/KDE/kdelibs/; revision=969756 --- modules/FindLibKonq.cmake | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/modules/FindLibKonq.cmake b/modules/FindLibKonq.cmake index f9a06d2f..365708f8 100644 --- a/modules/FindLibKonq.cmake +++ b/modules/FindLibKonq.cmake @@ -4,36 +4,19 @@ # LIBKONQ_FOUND - system has libkonq library # LIBKONQ_INCLUDE_DIR - the LIBKONQ include directory # LIBKONQ_LIBRARY - the libkonq library -# + # Original file: FindMarbleWidget.cmake (found in digikam-0.10.0-beta2) # copyright 2008 by Patrick Spendrin +# Copyright (c) 2009, Alexander Neundorf, # use this file as you like # # Modifications to find libkonq by Joachim Eibl 2008 -if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - - # Already in cache - set(LIBKONQ_FOUND TRUE) - -else(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h ) - - find_library(LIBKONQ_LIBRARY konq) +find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h ) - if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) - set(LIBKONQ_FOUND TRUE) - endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) +find_library(LIBKONQ_LIBRARY konq) - if(LIBKONQ_FOUND) - if (NOT LIBKONQ_FIND_QUIETLY) - message(STATUS "Found libkonq: ${LIBKONQ_LIBRARY}") - endif (NOT LIBKONQ_FIND_QUIETLY) - else(LIBKONQ_FOUND) - if(LIBKONQ_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find KDE4 libkonq library") - endif(LIBKONQ_FIND_REQUIRED) - endif(LIBKONQ_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIBKONQ DEFAULT_MSG LIBKONQ_INCLUDE_DIR LIBKONG_LIBRARY ) - mark_as_advanced(LIBKONQ_INCLUDE_DIR LIBKONQ_LIBRARY) -endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) +mark_as_advanced(LIBKONQ_INCLUDE_DIR LIBKONQ_LIBRARY) -- cgit v1.2.1