From 1511cad3ffbbb7548a6fa9662aac13620facd5cc Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 19 Sep 2006 20:00:35 +0000 Subject: prepare for merging to cmake Alex svn path=/trunk/KDE/kdelibs/; revision=586500 --- modules/FindASPELL.cmake | 53 +++++++++----------- modules/FindBZip2.cmake | 66 +++++++++++-------------- modules/FindGIF.cmake | 49 ++++++++---------- modules/FindHSPELL.cmake | 55 ++++++++++----------- modules/FindJasper.cmake | 57 ++++++++++----------- modules/FindLibXml2.cmake | 85 ++++++++++++++++---------------- modules/FindLibXslt.cmake | 71 +++++++++++++------------- modules/FindOpenSSL.cmake | 123 +++++++++++++++++++++------------------------- 8 files changed, 254 insertions(+), 305 deletions(-) (limited to 'modules') diff --git a/modules/FindASPELL.cmake b/modules/FindASPELL.cmake index 67ca19a3..978407d6 100644 --- a/modules/FindASPELL.cmake +++ b/modules/FindASPELL.cmake @@ -5,41 +5,36 @@ # ASPELL_INCLUDE_DIR - the ASPELL include directory # ASPELL_LIBRARIES - The libraries needed to use ASPELL # ASPELL_DEFINITIONS - Compiler switches required for using ASPELL -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) +IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) # Already in cache, be silent - set(ASPELL_FIND_QUIETLY TRUE) -endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) - -FIND_PATH(ASPELL_INCLUDE_DIR aspell.h - /usr/include - /usr/local/include -) - -FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15 - PATHS - /usr/lib - /usr/local/lib -) - -if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) - set(ASPELL_FOUND TRUE) -endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) - -if (ASPELL_FOUND) - if (NOT ASPELL_FIND_QUIETLY) - message(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}") - endif (NOT ASPELL_FIND_QUIETLY) -else (ASPELL_FOUND) - if (ASPELL_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find ASPELL") - endif (ASPELL_FIND_REQUIRED) -endif (ASPELL_FOUND) + SET(ASPELL_FIND_QUIETLY TRUE) +ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) + +FIND_PATH(ASPELL_INCLUDE_DIR aspell.h ) + +FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15) + +IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) + SET(ASPELL_FOUND TRUE) +ELSE (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) + SET(ASPELL_FOUND FALSE) +ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) + +IF (ASPELL_FOUND) + IF (NOT ASPELL_FIND_QUIETLY) + MESSAGE(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}") + ENDIF (NOT ASPELL_FIND_QUIETLY) +ELSE (ASPELL_FOUND) + IF (ASPELL_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find ASPELL") + ENDIF (ASPELL_FIND_REQUIRED) +ENDIF (ASPELL_FOUND) MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES) diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake index 492c3054..c8464249 100644 --- a/modules/FindBZip2.cmake +++ b/modules/FindBZip2.cmake @@ -6,48 +6,38 @@ # BZIP2_LIBRARIES - Link these to use BZip2 # BZIP2_DEFINITIONS - Compiler switches required for using BZip2 # BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_ -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) + SET(BZip2_FIND_QUIETLY TRUE) +ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) + +FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h ) + +FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 ) + +IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) + SET(BZIP2_FOUND TRUE) + INCLUDE(CheckLibraryExists) + CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX) +ELSE (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) + SET(BZIP2_FOUND FALSE) +ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) + +IF (BZIP2_FOUND) + IF (NOT BZip2_FIND_QUIETLY) + MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARIES}") + ENDIF (NOT BZip2_FIND_QUIETLY) +ELSE (BZIP2_FOUND) + IF (BZip2_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find BZip2") + ENDIF (BZip2_FIND_REQUIRED) +ENDIF (BZIP2_FOUND) + +MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES) -if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - - # in cache already, avoid doing the CHECK_LIBRARY_EXISTS again. - SET(BZIP2_FOUND TRUE) - -else (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - - FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h - /usr/include - /usr/local/include - ) - - FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 - PATHS - /usr/lib - /usr/local/lib - ) - - if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - set(BZIP2_FOUND TRUE) - INCLUDE(CheckLibraryExists) - CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX) - endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - - if (BZIP2_FOUND) - if (NOT BZip2_FIND_QUIETLY) - message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}") - endif (NOT BZip2_FIND_QUIETLY) - else (BZIP2_FOUND) - if (BZip2_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find BZip2") - endif (BZip2_FIND_REQUIRED) - endif (BZIP2_FOUND) - - MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES) - -endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake index 14efd818..a46194ab 100644 --- a/modules/FindGIF.cmake +++ b/modules/FindGIF.cmake @@ -5,42 +5,35 @@ # GIF_INCLUDE_DIR - the GIF include directory # GIF_LIBRARIES - Libraries needed to use GIF # GIF_DEFINITIONS - Compiler switches required for using GIF -# + # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. -if (GIF_INCLUDE_DIR AND GIF_LIBRARIES) +IF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) # Already in cache, be silent - set(GIF_FIND_QUIETLY TRUE) -endif (GIF_INCLUDE_DIR AND GIF_LIBRARIES) + SET(GIF_FIND_QUIETLY TRUE) +ENDIF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) -FIND_PATH(GIF_INCLUDE_DIR gif_lib.h - /usr/include - /usr/local/include -) +FIND_PATH(GIF_INCLUDE_DIR gif_lib.h) -set(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib) -FIND_LIBRARY(GIF_LIBRARIES NAMES ${POTENTIAL_GIF_LIBS} - PATHS - /usr/lib - /usr/local/lib -) +SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib) +FIND_LIBRARY(GIF_LIBRARIES NAMES ${POTENTIAL_GIF_LIBS}) -if (GIF_INCLUDE_DIR AND GIF_LIBRARIES) - set(CMAKE_REQUIRED_INCLUDES "${GIF_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}") +IF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) + SET(CMAKE_REQUIRED_INCLUDES "${GIF_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}") CHECK_STRUCT_MEMBER(GifFileType UserData gif_lib.h GIF_FOUND) -endif (GIF_INCLUDE_DIR AND GIF_LIBRARIES) +ENDIF (GIF_INCLUDE_DIR AND GIF_LIBRARIES) -if (GIF_FOUND) - if (NOT GIF_FIND_QUIETLY) - message(STATUS "Found GIF: ${GIF_LIBRARIES}") - endif (NOT GIF_FIND_QUIETLY) -else (GIF_FOUND) - if (GIF_FIND_REQUIRED) - message(STATUS "Looked for GIF libraries named ${POTENTIAL_GIF_LIBS}.") - message(STATUS "Found no acceptable GIF library. This is fatal.") - message(FATAL_ERROR "Could NOT find GIF") - endif (GIF_FIND_REQUIRED) -endif (GIF_FOUND) +IF (GIF_FOUND) + IF (NOT GIF_FIND_QUIETLY) + MESSAGE(STATUS "Found GIF: ${GIF_LIBRARIES}") + ENDIF (NOT GIF_FIND_QUIETLY) +ELSE (GIF_FOUND) + IF (GIF_FIND_REQUIRED) + MESSAGE(STATUS "Looked for GIF libraries named ${POTENTIAL_GIF_LIBS}.") + MESSAGE(STATUS "Found no acceptable GIF library. This is fatal.") + MESSAGE(FATAL_ERROR "Could NOT find GIF") + ENDIF (GIF_FIND_REQUIRED) +ENDIF (GIF_FOUND) MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES) diff --git a/modules/FindHSPELL.cmake b/modules/FindHSPELL.cmake index 08a5792c..a2b93a77 100644 --- a/modules/FindHSPELL.cmake +++ b/modules/FindHSPELL.cmake @@ -5,43 +5,38 @@ # HSPELL_INCLUDE_DIR - the HSPELL include directory # HSPELL_LIBRARIES - The libraries needed to use HSPELL # HSPELL_DEFINITIONS - Compiler switches required for using HSPELL -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) +IF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) # Already in cache, be silent - set(HSPELL_FIND_QUIETLY TRUE) -endif (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) - - -FIND_PATH(HSPELL_INCLUDE_DIR hspell.h - /usr/include - /usr/local/include -) - -FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell - PATHS - /usr/lib - /usr/local/lib -) - -if (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) - set(HSPELL_FOUND TRUE) -endif (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) - -if (HSPELL_FOUND) - if (NOT HSPELL_FIND_QUIETLY) - message(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}") - endif (NOT HSPELL_FIND_QUIETLY) -else (HSPELL_FOUND) - if (HSPELL_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find HSPELL") - endif (HSPELL_FIND_REQUIRED) -endif (HSPELL_FOUND) + SET(HSPELL_FIND_QUIETLY TRUE) +ENDIF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) + + +FIND_PATH(HSPELL_INCLUDE_DIR hspell.h ) + +FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell ) + +IF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) + SET(HSPELL_FOUND TRUE) +ELSE (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) + SET(HSPELL_FOUND FALSE) +ENDIF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) + +IF (HSPELL_FOUND) + IF (NOT HSPELL_FIND_QUIETLY) + MESSAGE(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}") + ENDIF (NOT HSPELL_FIND_QUIETLY) +ELSE (HSPELL_FOUND) + IF (HSPELL_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find HSPELL") + ENDIF (HSPELL_FIND_REQUIRED) +ENDIF (HSPELL_FOUND) MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES) diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake index 99b52a77..ac284c37 100644 --- a/modules/FindJasper.cmake +++ b/modules/FindJasper.cmake @@ -4,7 +4,7 @@ # JASPER_FOUND - system has Jasper # JASPER_INCLUDE_DIR - the Jasper include directory # JASPER_LIBRARIES - The libraries needed to use Jasper -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. @@ -13,36 +13,31 @@ FIND_PACKAGE(JPEG) -if (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) +IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) # Already in cache, be silent - set(Jasper_FIND_QUIETLY TRUE) -endif (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) - -FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h - /usr/include - /usr/local/include -) - -FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper - PATHS - /usr/lib - /usr/local/lib -) - -if (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES) - set(JASPER_FOUND TRUE) - set(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} ) -endif (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES) - - -if (JASPER_FOUND) - if (NOT Jasper_FIND_QUIETLY) - message(STATUS "Found jasper: ${JASPER_LIBRARIES}") - endif (NOT Jasper_FIND_QUIETLY) -else (JASPER_FOUND) - if (Jasper_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find jasper library") - endif (Jasper_FIND_REQUIRED) -endif (JASPER_FOUND) + SET(Jasper_FIND_QUIETLY TRUE) +ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) + +FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h) + +FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper) + +IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES) + SET(JASPER_FOUND TRUE) + SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} ) +ELSE (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES) + SET(JASPER_FOUND FALSE) +ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES) + + +IF (JASPER_FOUND) + IF (NOT Jasper_FIND_QUIETLY) + MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARIES}") + ENDIF (NOT Jasper_FIND_QUIETLY) +ELSE (JASPER_FOUND) + IF (Jasper_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find jasper library") + ENDIF (Jasper_FIND_REQUIRED) +ENDIF (JASPER_FOUND) MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES JASPER_LIBRARY) diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index a1fb8b42..b45d7293 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -8,53 +8,52 @@ # # Copyright (c) 2006, Alexander Neundorf # This code is available under the BSD license, see licenses/BSD for details. -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - - # in cache already - SET(LIBXML2_FOUND TRUE) - -else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - - IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) - set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) - ENDIF (NOT WIN32) - - FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - PATHS - ${_LibXml2IncDir} - PATH_SUFFIXES libxml2 - ) - - FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 - PATHS - ${_LibXml2LinkDir} - ) - - if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - set(LIBXML2_FOUND TRUE) - endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - - if (LIBXML2_FOUND) - if (NOT LibXml2_FIND_QUIETLY) - message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - endif (NOT LibXml2_FIND_QUIETLY) - else (LIBXML2_FOUND) - if (LibXml2_FIND_REQUIRED) - message(SEND_ERROR "Could NOT find LibXml2") - endif (LibXml2_FIND_REQUIRED) - endif (LIBXML2_FOUND) - - MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) +IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + # in cache already + SET(LibXml2_FIND_QUIETLY TRUE) +ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) + SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +ENDIF (NOT WIN32) + +FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + PATHS + ${_LibXml2IncDir} + PATH_SUFFIXES libxml2 + ) + +FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 + PATHS + ${_LibXml2LinkDir} + ) + +IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + SET(LIBXML2_FOUND TRUE) +ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + SET(LIBXML2_FOUND FALSE) +ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +IF (LIBXML2_FOUND) + IF (NOT LibXml2_FIND_QUIETLY) + MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") + ENDIF (NOT LibXml2_FIND_QUIETLY) +ELSE (LIBXML2_FOUND) + IF (LibXml2_FIND_REQUIRED) + MESSAGE(SEND_ERROR "Could NOT find LibXml2") + ENDIF (LibXml2_FIND_REQUIRED) +ENDIF (LIBXML2_FOUND) + +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) -endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake index 6f116f5d..fcebd0c1 100644 --- a/modules/FindLibXslt.cmake +++ b/modules/FindLibXslt.cmake @@ -5,55 +5,50 @@ # LIBXSLT_INCLUDE_DIR - the LibXslt include directory # LIBXSLT_LIBRARIES - Link these to LibXslt # LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) - - # in cache already - SET(LIBXSLT_FOUND TRUE) +IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) + # in cache already + SET(LibXslt_FIND_QUIETLY TRUE) +ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) -else (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags) + SET(LIBXSLT_DEFINITIONS ${_LibXsltCflags}) +ENDIF (NOT WIN32) - IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags) - set(LIBXSLT_DEFINITIONS ${_LibXsltCflags}) - ENDIF (NOT WIN32) - - FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h +FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h ${_LibXsltIncDir} - /usr/include - /usr/local/include ) - - FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt + +FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt PATHS ${_LibXsltLinkDir} - /usr/lib - /usr/local/lib ) + +IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) + SET(LIBXSLT_FOUND TRUE) +ELSE (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) + SET(LIBXSLT_FOUND FALSE) +ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) - if (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) - set(LIBXSLT_FOUND TRUE) - endif (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) - - if (LIBXSLT_FOUND) - if (NOT LibXslt_FIND_QUIETLY) - message(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}") - endif (NOT LibXslt_FIND_QUIETLY) - else (LIBXSLT_FOUND) - if (LibXslt_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find LibXslt") - endif (LibXslt_FIND_REQUIRED) - endif (LIBXSLT_FOUND) - - MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES) - -endif (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) +IF (LIBXSLT_FOUND) + IF (NOT LibXslt_FIND_QUIETLY) + MESSAGE(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}") + ENDIF (NOT LibXslt_FIND_QUIETLY) +ELSE (LIBXSLT_FOUND) + IF (LibXslt_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find LibXslt") + ENDIF (LibXslt_FIND_REQUIRED) +ENDIF (LIBXSLT_FOUND) + +MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES) + diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake index f4bd85bd..0172df83 100644 --- a/modules/FindOpenSSL.cmake +++ b/modules/FindOpenSSL.cmake @@ -4,80 +4,67 @@ # OPENSSL_FOUND - system has the OpenSSL library # OPENSSL_INCLUDE_DIR - the OpenSSL include directory # OPENSSL_LIBRARIES - The libraries needed to use OpenSSL -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if(OPENSSL_LIBRARIES) - SET(LIB_FOUND 1) -endif(OPENSSL_LIBRARIES) +IF(OPENSSL_LIBRARIES) + SET(OpenSSL_FIND_QUIETLY TRUE) +ENDIF(OPENSSL_LIBRARIES) -if(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) +IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) SET(LIB_FOUND 1) -endif(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) - -if (OPENSSL_INCLUDE_DIR AND LIB_FOUND) - - # in cache already - SET(OPENSSL_FOUND TRUE) - -else (OPENSSL_INCLUDE_DIR AND LIB_FOUND) - - FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h - /usr/include/ - /usr/local/include/ - ) - - if(WIN32 AND MSVC) - # /MD and /MDd are the standard values - if somone wants to use - # others, the libnames have to change here too - # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b - - FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32) - FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32) - - IF(MSVC_IDE) - IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) - SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}) - ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) - MESSAGE(FATAL_ERROR "Could not find the debug and release version of openssl") - ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) - ELSE(MSVC_IDE) - STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG}) - ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE}) - ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - ENDIF(MSVC_IDE) - MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE) - else(WIN32 AND MSVC) - - FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD - PATHS - /usr/lib - /usr/local/lib - ) - - endif(WIN32 AND MSVC) - - if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) - set(OPENSSL_FOUND TRUE) - endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) - - if (OPENSSL_FOUND) - if (NOT OpenSSL_FIND_QUIETLY) - message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") - endif (NOT OpenSSL_FIND_QUIETLY) - else (OPENSSL_FOUND) - if (OpenSSL_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find OpenSSL") - endif (OpenSSL_FIND_REQUIRED) - endif (OPENSSL_FOUND) - - MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) +ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) + +FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h ) + +IF(WIN32 AND MSVC) + # /MD and /MDd are the standard values - if somone wants to use + # others, the libnames have to change here too + # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b + + FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32) + FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32) + + IF(MSVC_IDE) + IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) + SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}) + ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) + MESSAGE(FATAL_ERROR "Could not find the debug and release version of openssl") + ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) + ELSE(MSVC_IDE) + STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG}) + ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE}) + ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + ENDIF(MSVC_IDE) + MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE) +ELSE(WIN32 AND MSVC) + + FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD ) + +ENDIF(WIN32 AND MSVC) + +IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) + SET(OPENSSL_FOUND TRUE) +ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) + SET(OPENSSL_FOUND FALSE) +ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) + +IF (OPENSSL_FOUND) + IF (NOT OpenSSL_FIND_QUIETLY) + MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") + ENDIF (NOT OpenSSL_FIND_QUIETLY) +ELSE (OPENSSL_FOUND) + IF (OpenSSL_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find OpenSSL") + ENDIF (OpenSSL_FIND_REQUIRED) +ENDIF (OPENSSL_FOUND) + +MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) -endif (OPENSSL_INCLUDE_DIR AND LIB_FOUND) -- cgit v1.2.1