early-access version 2698

externals/libressl/CMakeLists.txt

@@ -98,7 +98,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
-	set(PLATFORM_LIBS ${PLATFORM_LIBS} nsl socket)
+	set(PLATFORM_LIBS ${PLATFORM_LIBS} dl md nsl socket)
 endif()
 
 add_definitions(-DLIBRESSL_INTERNAL)
@@ -113,19 +113,21 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 endif()
 
 if(WIN32)
-	add_definitions(-Drestrict)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 	add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS)
 	add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
-	add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
 	add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT)
-	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
+	add_definitions(-DWIN32_LEAN_AND_MEAN)
+	if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+		add_definitions(-D_WIN32_WINNT=0x0600)
+	endif()
+	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
 endif()
 
 if(MSVC)
 	add_definitions(-Dinline=__inline)
 	message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler")
-	if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
+	if(CMAKE_C_COMPILER_ID MATCHES "MSVC" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 		set(MSVC_DISABLED_WARNINGS_LIST
 			"C4018" # 'expression' : signed/unsigned mismatch
 			"C4057" # 'operator' : 'identifier1' indirection to
@@ -284,11 +286,21 @@ if(HAVE_MEMMEM)
 	add_definitions(-DHAVE_MEMMEM)
 endif()
 
+check_include_files(endian.h HAVE_ENDIAN_H)
+if(HAVE_ENDIAN_H)
+	add_definitions(-DHAVE_ENDIAN_H)
+endif()
+
 check_include_files(err.h HAVE_ERR_H)
 if(HAVE_ERR_H)
 	add_definitions(-DHAVE_ERR_H)
 endif()
 
+check_include_files("sys/types.h;arpa/inet.h;netinet/ip.h" HAVE_NETINET_IP_H)
+if(HAVE_NETINET_IP_H)
+	add_definitions(-DHAVE_NETINET_IP_H)
+endif()
+
 if(ENABLE_ASM)
 	if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF")
 		if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)")
@@ -298,6 +310,7 @@ if(ENABLE_ASM)
 		elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386")
 			set(HOST_ASM_ELF_X86_64 true)
 		endif()
+		add_definitions(-DHAVE_GNU_STACK)
 	elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
 		set(HOST_ASM_MACOSX_X86_64 true)
 	elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
@@ -331,30 +344,65 @@ if(SIZEOF_TIME_T STREQUAL "4")
 endif()
 add_definitions(-DSIZEOF_TIME_T=${SIZEOF_TIME_T})
 
-set(OPENSSL_LIBS tls ssl crypto ${PLATFORM_LIBS})
+set(OPENSSL_LIBS ssl crypto ${PLATFORM_LIBS})
+set(LIBTLS_LIBS tls ${PLATFORM_LIBS})
+
+# libraries for regression test
+if(BUILD_SHARED_LIBS)
+	set(OPENSSL_TEST_LIBS ssl-static crypto-static ${PLATFORM_LIBS})
+	set(LIBTLS_TEST_LIBS tls-static ${PLATFORM_LIBS})
+else()
+	set(OPENSSL_TEST_LIBS ssl crypto ${PLATFORM_LIBS})
+	set(LIBTLS_TEST_LIBS tls ${PLATFORM_LIBS})
+endif()
 
 add_subdirectory(crypto)
 add_subdirectory(ssl)
 add_subdirectory(tls)
 add_subdirectory(include)
 
-if(NOT MSVC)
-	# Create pkgconfig files.
-	set(prefix      ${CMAKE_INSTALL_PREFIX})
-	set(exec_prefix \${prefix})
-	set(libdir      \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
-	set(includedir  \${prefix}/include)
-	if(PLATFORM_LIBS)
-		string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}")
+if (BUILD_APPLE_XCFRAMEWORK)
+	# Create the super library from object libraries
+	add_library(LibreSSL_xcframework
+			$<TARGET_OBJECTS:crypto_obj> $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj>)
+	set_target_properties(LibreSSL_xcframework PROPERTIES
+			OUTPUT_NAME ressl)
+
+	if(ENABLE_LIBRESSL_INSTALL)
+		install(TARGETS LibreSSL_xcframework
+				LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+	endif(ENABLE_LIBRESSL_INSTALL)
+endif(BUILD_APPLE_XCFRAMEWORK)
+
+if(ENABLE_LIBRESSL_INSTALL)
+	if(NOT MSVC)
+		# Create pkgconfig files.
+		set(prefix      ${CMAKE_INSTALL_PREFIX})
+		set(exec_prefix \${prefix})
+		set(libdir      \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+		set(includedir  \${prefix}/include)
+		if(PLATFORM_LIBS)
+			string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}")
+		endif()
+		file(STRINGS    "VERSION" VERSION LIMIT_COUNT 1)
+		file(GLOB       OPENSSL_PKGCONFIGS "*.pc.in")
+		foreach(file ${OPENSSL_PKGCONFIGS})
+			get_filename_component(filename ${file} NAME)
+			string(REPLACE ".in" "" new_file "${filename}")
+			configure_file(${filename} pkgconfig/${new_file} @ONLY)
+		endforeach()
+		install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig
+			DESTINATION ${CMAKE_INSTALL_LIBDIR})
 	endif()
-	file(STRINGS    "VERSION" VERSION LIMIT_COUNT 1)
-	file(GLOB       OPENSSL_PKGCONFIGS "*.pc.in")
-	foreach(file ${OPENSSL_PKGCONFIGS})
-		get_filename_component(filename ${file} NAME)
-		string(REPLACE ".in" "" new_file "${filename}")
-		configure_file(${filename} pkgconfig/${new_file} @ONLY)
-	endforeach()
-	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig
-		DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(ENABLE_LIBRESSL_INSTALL)
+
+if(NOT "${OPENSSLDIR}" STREQUAL "")
+	set(CONF_DIR "${OPENSSLDIR}")
+else()
+	set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
 endif()
 
+if(ENABLE_LIBRESSL_INSTALL)
+	install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR})
+	install(DIRECTORY DESTINATION ${CONF_DIR}/certs)
+endif(ENABLE_LIBRESSL_INSTALL)