From a6825607e04ea431b6b25c632b3dabbe1ed92f36 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Fri, 14 Mar 2008 13:32:23 +0000 Subject: [PATCH] - look for openssl in cmake, actually we build require it - explicitely link against openssl and crypto, required to compile in all platforms/distros. --- CMakeLists.txt | 2 ++ package/libzypp.changes | 7 +++++++ zypp/CMakeLists.txt | 2 ++ 3 files changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17ec7dd..c0809d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,6 +116,8 @@ ELSE ( NOT SATSOLVER_FOUND ) INCLUDE_DIRECTORIES( ${SATSOLVER_INCLUDE_DIR} ) ENDIF( NOT SATSOLVER_FOUND ) +FIND_PACKAGE(OpenSSL REQUIRED) + FIND_PROGRAM( DOXYGEN doxygen ) IF ( NOT DOXYGEN ) MESSAGE( FATAL_ERROR "doxygen not found: install doxygen to build the documentation." ) diff --git a/package/libzypp.changes b/package/libzypp.changes index f9a4ab1..4378119 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 14 14:27:43 CET 2008 - dmacvicar@suse.de + +- look for openssl in cmake, actually we build require it +- explicitely link against openssl and crypto, required to + compile in all platforms/distros. + +------------------------------------------------------------------- Fri Mar 14 12:07:41 CET 2008 - jreidinger@suse.cz - Save repo type during refresh if type is NONE (f.e. lazy probing). diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 5ef7956..1e6bc27 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -876,6 +876,8 @@ TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} ) TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} ) TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} ) TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ) +TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES}) +TARGET_LINK_LIBRARIES(zypp crypto) INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) -- 2.7.4