From 5269dbb2792fe5baf239e13f36352142364e1581 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Thu, 31 Jan 2019 10:00:48 -0600 Subject: update cmake --- CMakeLists.txt | 15 +++++++++++++++ crypto/CMakeLists.txt | 12 ++++++++++++ tls/CMakeLists.txt | 1 - 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46e01ae..4d54ada 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,6 +237,21 @@ if(HAVE_GETPAGESIZE) add_definitions(-DHAVE_GETPAGESIZE) endif() +check_function_exists(getprogname HAVE_GETPROGNAME) +if(HAVE_GETPROGNAME) + add_definitions(-DHAVE_GETPROGNAME) +endif() + +check_function_exists(syslog_r HAVE_SYSLOG_R) +if(HAVE_SYSLOG_R) + add_definitions(-DHAVE_SYSLOG_R) +endif() + +check_function_exists(syslog HAVE_SYSLOG) +if(HAVE_SYSLOG) + add_definitions(-DHAVE_SYSLOG) +endif() + check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB) if(HAVE_TIMESPECSUB) add_definitions(-DHAVE_TIMESPECSUB) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index a81d329..b7ce131 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -807,6 +807,14 @@ if(NOT HAVE_GETPAGESIZE) set(CRYPTO_SRC ${CRYPTO_SRC} compat/getpagesize.c) endif() +if(NOT HAVE_GETPROGNAME) + if(WIN32) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/getprogname_windows.c) + elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(CRYPTO_SRC ${CRYPTO_SRC} compat/getprogname_linux.c) + endif() +endif() + if(NOT HAVE_REALLOCARRAY) set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) @@ -846,6 +854,10 @@ if(NOT HAVE_STRSEP) set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) endif() +if(NOT HAVE_SYSLOG_R) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/syslog_r.c) +endif() + if(NOT HAVE_TIMEGM) set(CRYPTO_SRC ${CRYPTO_SRC} compat/timegm.c) set(EXTRA_EXPORT ${EXTRA_EXPORT} timegm) diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 337e89b..94803ce 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt @@ -18,7 +18,6 @@ if(WIN32) TLS_SRC ${TLS_SRC} compat/ftruncate.c - compat/getuid.c compat/pread.c compat/pwrite.c ) -- cgit v1.2.3-55-g6feb