diff options
| author | Sergei Nikulov <sergey.nikulov@gmail.com> | 2012-09-13 16:08:21 +0400 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-09-17 23:22:09 +0200 |
| commit | c1400f6f12f22d7c9a57b006f994e233b96ac627 (patch) | |
| tree | cd63c514621ce349c85f1b9fc1e2729fbaf9dccb | |
| parent | 889038f668d1ee565c54e7f418ae6aa9c52ace12 (diff) | |
cmake: use standard findxxx modules for cmake v2.8+
| -rw-r--r-- | CMake/FindOpenSSL.cmake | 20 | ||||
| -rw-r--r-- | CMake/FindZLIB.cmake | 10 |
2 files changed, 17 insertions, 13 deletions
diff --git a/CMake/FindOpenSSL.cmake b/CMake/FindOpenSSL.cmake index 63a9d6062..279428be2 100644 --- a/CMake/FindOpenSSL.cmake +++ b/CMake/FindOpenSSL.cmake @@ -2,17 +2,19 @@ # Adds OPENSSL_INCLUDE_DIRS and libeay32 include("${CMAKE_ROOT}/Modules/FindOpenSSL.cmake") -# Bill Hoffman told that libeay32 is necessary for him: -find_library(SSL_LIBEAY NAMES libeay32) +# 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) + if(OPENSSL_FOUND) + if(SSL_LIBEAY) + list(APPEND OPENSSL_LIBRARIES ${SSL_LIBEAY}) + else() + set(OPENSSL_FOUND FALSE) + endif() 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}) diff --git a/CMake/FindZLIB.cmake b/CMake/FindZLIB.cmake index 87f1d4fe8..b2cfe1879 100644 --- a/CMake/FindZLIB.cmake +++ b/CMake/FindZLIB.cmake @@ -1,8 +1,10 @@ # Locate zlib include("${CMAKE_ROOT}/Modules/FindZLIB.cmake") -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}) +# 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() |