From 75a07dd38b4a491a9d16d24492bea5c6ba90a8ff Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 12 Feb 2006 14:38:04 +0000 Subject: -moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its own FindKDEWIN32.cmake file -added a new FindGNUWIN32.cmake file, which tries to find the gnuwin32 base directory -changed all "FOO_LIBRARY" variable names to "FOO_LIBRARIES" to be more consistent with the other cmake modules -added a macro_getenv_win_path() which replaces all backslahes with slashes from environment variables -modified the kde4_add_kcfg_files() command, so that the generated header is also processed by moc -all tests compile and link Alex CCMAIL:kde-buildsystem@kde.org The changes to the windows stuff are untested, since I don't have a windows box. Please check that everything still works. Please have a look at FindGNUWIN32.cmake, there are probably ways to improve this. The resulting GNUWIN32_DIR variable is used in other cmake modules as default path to search for headers and libraries. svn path=/trunk/KDE/kdelibs/; revision=508648 --- modules/FindOpenSSL.cmake | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'modules/FindOpenSSL.cmake') diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake index e5240905..93625b4f 100644 --- a/modules/FindOpenSSL.cmake +++ b/modules/FindOpenSSL.cmake @@ -1,26 +1,35 @@ +# - Try to find the OpenSSL encryption library +# Once done this will define +# +# OPENSSL_FOUND - system has the OpenSSL library +# OPENSSL_INCLUDE_DIR - the OpenSSL include directory +# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h -/usr/include/ -/usr/local/include/ + /usr/include/ + /usr/local/include/ ) -FIND_LIBRARY(OPENSSL_LIBRARY NAMES ssl ssleay32 -PATHS -/usr/lib -/usr/local/lib +FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 + PATHS + /usr/lib + /usr/local/lib ) -IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY) +IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) SET(OPENSSL_FOUND TRUE) -ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY) +ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) IF(OPENSSL_FOUND) IF(NOT OpenSSL_FIND_QUIETLY) - MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARY}") + 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) + -- cgit v1.2.1