aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-04-10 13:31:37 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-04-10 13:32:09 +0200
commit6c7e55250927859ad2b7fee06e710402ff564f4c (patch)
tree49f6e2a2452eb444d194a3cc23330b47d37acb75
parentb1cb8de3858b4fb6878f3e10e7b749ef55b2574c (diff)
downloadlibssh-6c7e55250927859ad2b7fee06e710402ff564f4c.tar.gz
libssh-6c7e55250927859ad2b7fee06e710402ff564f4c.tar.xz
libssh-6c7e55250927859ad2b7fee06e710402ff564f4c.zip
cmake: Require cmake version 2.8.0
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/Modules/FindOpenSSL.cmake208
-rw-r--r--cmake/Modules/FindZLIB.cmake120
-rw-r--r--src/CMakeLists.txt9
4 files changed, 5 insertions, 334 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9109df3..5d454655 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
project(libssh C)
# Required cmake version
-cmake_minimum_required(VERSION 2.6.0)
+cmake_minimum_required(VERSION 2.8.0)
# global needed variables
set(APPLICATION_NAME ${PROJECT_NAME})
diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake
deleted file mode 100644
index 565190c6..00000000
--- a/cmake/Modules/FindOpenSSL.cmake
+++ /dev/null
@@ -1,208 +0,0 @@
-# - Try to find OpenSSL
-# Once done this will define
-#
-# OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
-#
-# Read-Only variables:
-# OPENSSL_FOUND - system has OpenSSL
-# OPENSSL_INCLUDE_DIRS - the OpenSSL include directory
-# OPENSSL_LIBRARIES - Link these to use OpenSSL
-# OPENSSL_DEFINITIONS - Compiler switches required for using OpenSSL
-#
-#=============================================================================
-# Copyright (c) 2006-2009 Kitware, Inc.
-# Copyright (c) 2006 Alexander Neundorf <neundorf@kde.org>
-# Copyright (c) 2009-2010 Mathieu Malaterre <mathieu.malaterre@gmail.com>
-# Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-#
-
-if (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
- # in cache already
- set(OPENSSL_FOUND TRUE)
-else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
-
- if (UNIX)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(_OPENSSL openssl)
- endif (PKG_CONFIG_FOUND)
- endif (UNIX)
-
- # http://www.slproweb.com/products/Win32OpenSSL.html
- set(_OPENSSL_ROOT_HINTS
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
- )
-
- set(_OPENSSL_ROOT_PATHS
- "C:/OpenSSL/"
- "C:/OpenSSL-Win32/"
- "C:/OpenSSL-Win64/"
- "$ENV{PROGRAMFILES}/OpenSSL"
- "$ENV{PROGRAMFILES}/OpenSSL-Win32"
- "$ENV{PROGRAMFILES}/OpenSSL-Win64"
- )
-
- find_path(OPENSSL_ROOT_DIR
- NAMES
- include/openssl/ssl.h
- HINTS
- ${_OPENSSL_ROOT_HINTS}
- PATHS
- ${_OPENSSL_ROOT_PATHS}
- )
- mark_as_advanced(OPENSSL_ROOT_DIR)
-
- find_path(OPENSSL_INCLUDE_DIR
- NAMES
- openssl/ssl.h
- PATHS
- /usr/local/include
- /opt/local/include
- /sw/include
- /usr/lib/sfw/include
- ${OPENSSL_ROOT_DIR}/include
- )
-
- set(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
- mark_as_advanced(OPENSSL_INCLUDE_DIRS)
-
- if (WIN32 AND NOT CYGWIN)
- # MINGW should go here too
- if (MSVC)
- # /MD and /MDd are the standard values - if someone 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
- # TODO: handle /MT and static lib
- # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
- # * MD for dynamic-release
- # * MDd for dynamic-debug
- # * MT for static-release
- # * MTd for static-debug
-
- # Implementation details:
- # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
- # libeay32MD.lib is identical to ../libeay32.lib, and
- # ssleay32MD.lib is identical to ../ssleay32.lib
- find_library(LIB_EAY_DEBUG
- NAMES
- libeay32MDd
- libeay32
- PATHS
- ${OPENSSL_ROOT_DIR}/lib/VC
- )
-
- find_library(LIB_EAY_RELEASE
- NAMES
- libeay32MD
- libeay32
- PATHS
- ${OPENSSL_ROOT_DIR}/lib/VC
- )
-
- find_library(SSL_EAY_DEBUG
- NAMES
- ssleay32MDd
- ssleay32
- ssl
- PATHS ${OPENSSL_ROOT_DIR}/lib/VC
- )
-
- find_library(SSL_EAY_RELEASE
- NAMES
- ssleay32MD
- ssleay32
- ssl
- PATHS
- ${OPENSSL_ROOT_DIR}/lib/VC
- )
-
- if (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- set(OPENSSL_LIBRARIES
- optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
- optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG}
- )
- else (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )
- endif (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-
- mark_as_advanced(SSL_EAY_DEBUG SSL_EAY_RELEASE)
- mark_as_advanced(LIB_EAY_DEBUG LIB_EAY_RELEASE)
- elseif (MINGW)
- # same player, for MingW
- find_library(LIB_EAY
- NAMES
- libeay32
- PATHS
- ${OPENSSL_ROOT_DIR}/lib/MinGW
- )
-
- find_library(SSL_EAY
- NAMES
- ssleay32
- PATHS
- ${OPENSSL_ROOT_DIR}/lib/MinGW
- )
-
- mark_as_advanced(SSL_EAY LIB_EAY)
- set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY})
- else(MSVC)
- # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
- find_library(LIB_EAY
- NAMES
- libeay32
- PATHS
- ${OPENSSL_ROOT_DIR}/lib
- )
-
- find_library(SSL_EAY
- NAMES
- ssleay32
- PATHS
- ${OPENSSL_ROOT_DIR}/lib
- )
-
- mark_as_advanced(SSL_EAY LIB_EAY)
- set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY})
- endif(MSVC)
- else (WIN32 AND NOT CYGWIN)
- find_library(OPENSSL_SSL_LIBRARIES
- NAMES
- ssl
- ssleay32
- ssleay32MD
- PATHS
- ${_OPENSSL_LIBDIR}
- /opt/local/lib
- /sw/lib
- /usr/sfw/lib/64
- /usr/sfw/lib
- )
-
- find_library(OPENSSL_CRYPTO_LIBRARIES
- NAMES
- crypto
- PATHS
- ${_OPENSSL_LIBDIR}
- /opt/local/lib
- /sw/lib
- /usr/sfw/lib/64
- /usr/sfw/lib
- )
-
- mark_as_advanced(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
- set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
- endif (WIN32 AND NOT CYGWIN)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(OpenSSL DEFAULT_MSG OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIRS)
-
-endif (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
diff --git a/cmake/Modules/FindZLIB.cmake b/cmake/Modules/FindZLIB.cmake
deleted file mode 100644
index f68207e4..00000000
--- a/cmake/Modules/FindZLIB.cmake
+++ /dev/null
@@ -1,120 +0,0 @@
-# - Try to find ZLIB
-# Once done this will define
-#
-# ZLIB_ROOT_DIR - Set this variable to the root installation of ZLIB
-#
-# Read-Only variables:
-# ZLIB_FOUND - system has ZLIB
-# ZLIB_INCLUDE_DIRS - the ZLIB include directory
-# ZLIB_LIBRARIES - Link these to use ZLIB
-#
-# ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-# ZLIB_VERSION_MAJOR - The major version of zlib
-# ZLIB_VERSION_MINOR - The minor version of zlib
-# ZLIB_VERSION_PATCH - The patch version of zlib
-# ZLIB_VERSION_TWEAK - The tweak version of zlib
-#
-# The following variable are provided for backward compatibility
-#
-# ZLIB_MAJOR_VERSION - The major version of zlib
-# ZLIB_MINOR_VERSION - The minor version of zlib
-# ZLIB_PATCH_VERSION - The patch version of zlib
-#
-#=============================================================================
-# Copyright (c) 2001-2009 Kitware, Inc.
-# Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-#
-
-if (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
- # in cache already
- set(ZLIB_FOUND TRUE)
-else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
-
- set(_ZLIB_ROOT_HINTS
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
- )
-
- set(_ZLIB_ROOT_PATHS
- "$ENV{PROGRAMFILES}/zlib"
- )
-
- find_path(ZLIB_ROOT_DIR
- NAMES
- include/zlib.h
- HINTS
- ${_ZLIB_ROOT_HINTS}
- PATHS
- ${_ZLIB_ROOT_PATHS}
- )
- mark_as_advanced(ZLIB_ROOT_DIR)
-
- # check for header file
- find_path(ZLIB_INCLUDE_DIR
- NAMES
- zlib.h
- PATHS
- /usr/local/include
- /opt/local/include
- /sw/include
- /usr/lib/sfw/include
- ${ZLIB_ROOT_DIR}/include
- )
- mark_as_advanced(ZLIB_INCLUDE_DIR)
-
- # check version number
- if (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
- file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-
- string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
- string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR "${ZLIB_H}")
- string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-
- set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-
- # only append a TWEAK version if it exists:
- set(ZLIB_VERSION_TWEAK "")
- if ("${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
- set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
- set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
- endif ("${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
-
- set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
- set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
- set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
- endif (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-
- find_library(ZLIB_LIBRARY
- NAMES
- z
- zdll
- zlib
- zlib1
- zlibd
- PATHS
- /usr/local/lib
- /opt/local/lib
- /sw/lib
- /usr/sfw/lib/64
- /usr/sfw/lib
- ${ZLIB_ROOT_DIR}/lib
- )
- mark_as_advanced(ZLIB_LIBRARY)
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(ZLIB DEFAULT_MSG ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
- #find_package_handle_standard_args(ZLIB REQUIRED_VARS ZLIB_INCLUDE_DIR ZLIB_LIBRARY
- # VERSION_VAR ZLIB_VERSION_STRING)
-
- if (ZLIB_FOUND)
- set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
- set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
- endif (ZLIB_FOUND)
-endif (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd5fbfba..1eb6764c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,6 @@ set(LIBSSH_PUBLIC_INCLUDE_DIRS
set(LIBSSH_PRIVATE_INCLUDE_DIRS
${CMAKE_BINARY_DIR}
- ${OPENSSL_INCLUDE_DIRS}
)
set(LIBSSH_LINK_LIBRARIES
@@ -28,17 +27,17 @@ if (HAVE_LIBSOCKET)
)
endif (HAVE_LIBSOCKET)
-if (OPENSSL_CRYPTO_LIBRARIES)
+if (OPENSSL_CRYPTO_LIBRARY)
set(LIBSSH_PRIVATE_INCLUDE_DIRS
${LIBSSH_PRIVATE_INCLUDE_DIRS}
- ${OPENSSL_INCLUDE_DIRS}
+ ${OPENSSL_INCLUDE_DIR}
)
set(LIBSSH_LINK_LIBRARIES
${LIBSSH_LINK_LIBRARIES}
- ${OPENSSL_CRYPTO_LIBRARIES}
+ ${OPENSSL_CRYPTO_LIBRARY}
)
-endif (OPENSSL_CRYPTO_LIBRARIES)
+endif (OPENSSL_CRYPTO_LIBRARY)
if (GCRYPT_LIBRARY)
set(LIBSSH_PRIVATE_INCLUDE_DIRS