WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.

Commit c1400f6f authored Sep 13, 2012 by Sergei Nikulov Committed by Daniel Stenberg Sep 17, 2012

cmake: use standard findxxx modules for cmake v2.8+

parent 889038f6

CMake/FindOpenSSL.cmake

+11 −9

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		# 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)

		@@ -12,7 +14,7 @@ if(OPENSSL_FOUND)
		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})

CMake/FindZLIB.cmake

+6 −4

Original line number	Diff line number	Diff line
		# 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()