summaryrefslogtreecommitdiff
path: root/CMake
diff options
context:
space:
mode:
authorJakub Zakrzewski <jzakrzewski@e2ebridge.com>2014-07-30 17:24:47 +0200
committerDaniel Stenberg <daniel@haxx.se>2014-08-25 12:44:24 +0200
commit14aa8f0c117bbf959ad2a905cc772ea6bb26cc4a (patch)
treeae619f8b34c47a8e7737b81448ebee13e52808dd /CMake
parent898808fa8ca7b4a8e0866a5d7769ed1b50219328 (diff)
downloadcurl-14aa8f0c117bbf959ad2a905cc772ea6bb26cc4a.tar.gz
Cmake: Require at least CMake 2.8.
CMake 2.6 is already a bit old. Many bugs have been fixed since its release. We use 2.8 in our company and we have no intention of polluting our environment with old software, so 2.6 would not be tested. This shouldn't be a problem since all one need to build CMake from source is C and C++ compiler.
Diffstat (limited to 'CMake')
-rw-r--r--CMake/FindOpenSSL.cmake21
-rw-r--r--CMake/FindZLIB.cmake10
2 files changed, 0 insertions, 31 deletions
diff --git a/CMake/FindOpenSSL.cmake b/CMake/FindOpenSSL.cmake
deleted file mode 100644
index 279428be2..000000000
--- a/CMake/FindOpenSSL.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Extension of the standard FindOpenSSL.cmake
-# Adds OPENSSL_INCLUDE_DIRS and libeay32
-include("${CMAKE_ROOT}/Modules/FindOpenSSL.cmake")
-
-# starting 2.8 it is better to use standard modules
-if(CMAKE_MAJOR_VERSION EQUAL "2" AND CMAKE_MINOR_VERSION LESS "8")
- # Bill Hoffman told that libeay32 is necessary for him:
- find_library(SSL_LIBEAY NAMES libeay32)
-
- if(OPENSSL_FOUND)
- if(SSL_LIBEAY)
- list(APPEND OPENSSL_LIBRARIES ${SSL_LIBEAY})
- else()
- set(OPENSSL_FOUND FALSE)
- endif()
- endif()
-endif() # if (CMAKE_MAJOR_VERSION EQUAL "2" AND CMAKE_MINOR_VERSION LESS "8")
-
-if(OPENSSL_FOUND)
- set(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
-endif()
diff --git a/CMake/FindZLIB.cmake b/CMake/FindZLIB.cmake
deleted file mode 100644
index b2cfe1879..000000000
--- a/CMake/FindZLIB.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# Locate zlib
-include("${CMAKE_ROOT}/Modules/FindZLIB.cmake")
-
-# starting 2.8 it is better to use standard modules
-if(CMAKE_MAJOR_VERSION EQUAL "2" AND CMAKE_MINOR_VERSION LESS "8")
- find_library(ZLIB_LIBRARY_DEBUG NAMES zd zlibd zdlld zlib1d )
- if(ZLIB_FOUND AND ZLIB_LIBRARY_DEBUG)
- set( ZLIB_LIBRARIES optimized "${ZLIB_LIBRARY}" debug ${ZLIB_LIBRARY_DEBUG})
- endif()
-endif()