fixed portability issues

Author: nlitsme

CMakeLists.txt

@@ -36,7 +36,7 @@ endif()
 
 find_package(itslib REQUIRED)
 
-find_package(OpenSSL REQUIRED)
+find_package(openssl REQUIRED)
 find_package(Boost REQUIRED date_time)
 #find_package(ZLIB REQUIRED)
 find_package(zlib)

cmake_find/Findopenssl.cmake

@@ -0,0 +1,56 @@
+if (TARGET openssl_ssl)
+    return()
+endif()
+if (DARWIN)
+    find_path(OPENSSL_INCLUDE_PATH NAMES openssl/sha.h
+        PATHS $ENV{OPENSSL_ROOT_DIR}/include /usr/include /usr/local/include /usr/local/opt/openssl/include)
+    find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto 
+        PATHS $ENV{OPENSSL_ROOT_DIR}/lib /usr/local/opt/openssl/lib /usr/lib /usr/local/lib)
+    find_library(OPENSSL_SSL_LIBRARY NAMES ssl 
+        PATHS $ENV{OPENSSL_ROOT_DIR}/lib /usr/local/opt/openssl/lib /usr/lib /usr/local/lib)
+elseif(WIN32)
+    find_path(OPENSSL_INCLUDE_PATH NAMES openssl/sha.h
+        PATHS "c:/local/OpenSSL-Win64/include"
+              "c:/Program Files/OpenSSL-Win64/include")
+    find_library(OPENSSL_CRYPTO_LIBRARY NAMES libcrypto 
+        PATHS "c:/local/OpenSSL-Win64/lib"
+              "c:/Program Files/OpenSSL-Win64/lib")
+    find_library(OPENSSL_SSL_LIBRARY NAMES libssl 
+        PATHS "c:/local/OpenSSL-Win64/lib"
+              "c:/Program Files/OpenSSL-Win64/lib")
+
+else()
+    find_package(OpenSSL)
+    if (OpenSSL_FOUND)
+        return()
+    endif()
+
+    find_path(OPENSSL_INCLUDE_PATH NAMES openssl/sha.h
+        PATHS /usr/include /usr/local/include /usr/local/opt/openssl/include)
+    find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto 
+        PATHS /usr/local/opt/openssl/lib /usr/lib /usr/local/lib)
+    find_library(OPENSSL_SSL_LIBRARY NAMES ssl 
+        PATHS /usr/local/opt/openssl/lib /usr/lib /usr/local/lib)
+endif()
+
+if (OPENSSL_CRYPTO_LIBRARY STREQUAL "OPENSSL_CRYPTO_LIBRARY-NOTFOUND")
+    message(FATAL_ERROR "Could not find libcrypto")
+endif()
+if (OPENSSL_SSL_LIBRARY STREQUAL "OPENSSL_SSL_LIBRARY-NOTFOUND")
+    message(FATAL_ERROR "Could not find libssl")
+endif()
+
+
+add_library(openssl_ssl INTERFACE)
+target_include_directories(openssl_ssl INTERFACE ${OPENSSL_INCLUDE_PATH})
+target_link_libraries(openssl_ssl INTERFACE ${OPENSSL_SSL_LIBRARY})
+target_compile_definitions(openssl_ssl INTERFACE -DOPENSSL_SUPPRESS_DEPRECATED)
+
+add_library(openssl_crypto INTERFACE)
+target_include_directories(openssl_crypto INTERFACE ${OPENSSL_INCLUDE_PATH})
+target_link_libraries(openssl_crypto INTERFACE ${OPENSSL_CRYPTO_LIBRARY})
+target_compile_definitions(openssl_crypto INTERFACE -DOPENSSL_SUPPRESS_DEPRECATED)
+
+add_library(OpenSSL::Crypto ALIAS openssl_crypto)
+add_library(OpenSSL::SSL ALIAS openssl_ssl)
+

cmake_find/Findzlib.cmake

@@ -1,13 +1,13 @@
 include(FetchContent)
 FetchContent_Populate(zlib
     # TODO: we need a method of supplying a local cache of this file.
-    URL http://www.zlib.net/zlib-1.2.13.tar.gz
-    URL_HASH SHA256=b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+    URL https://www.zlib.net/zlib-1.3.tar.gz
+    URL_HASH SHA256=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 )
 set(ZLIBDIR ${CMAKE_BINARY_DIR}/zlib-src)
 
 list(APPEND ZLIBFILES inftrees.c infback.c compress.c inffast.c adler32.c uncompr.c inflate.c deflate.c crc32.c trees.c zutil.c)
-list(APPEND ZLIBFILES gzclose.c gzread.c gzwrite.c gzlib.c)
+#list(APPEND ZLIBFILES gzclose.c gzread.c gzwrite.c gzlib.c)  <-- build failure on macos because of missing include <unistd.h>
 list(TRANSFORM ZLIBFILES PREPEND ${ZLIBDIR}/)
 add_library(zlib ${LIBSTYLE} ${ZLIBFILES})
 target_include_directories(zlib PUBLIC ${ZLIBDIR})