diff options
| author | Brent Cook <busterb@gmail.com> | 2019-01-31 10:00:48 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2019-01-31 13:56:56 -0600 |
| commit | 5269dbb2792fe5baf239e13f36352142364e1581 (patch) | |
| tree | a6e612ebf2c0d2afb8235fbd8b90d420bf186c9e | |
| parent | a6d7ea956290470254e817adb2f6a3fac9397a17 (diff) | |
| download | portable-5269dbb2792fe5baf239e13f36352142364e1581.tar.gz portable-5269dbb2792fe5baf239e13f36352142364e1581.tar.bz2 portable-5269dbb2792fe5baf239e13f36352142364e1581.zip | |
update cmake
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tls/CMakeLists.txt | 1 |
3 files changed, 27 insertions, 1 deletions
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) | |||
| 237 | add_definitions(-DHAVE_GETPAGESIZE) | 237 | add_definitions(-DHAVE_GETPAGESIZE) |
| 238 | endif() | 238 | endif() |
| 239 | 239 | ||
| 240 | check_function_exists(getprogname HAVE_GETPROGNAME) | ||
| 241 | if(HAVE_GETPROGNAME) | ||
| 242 | add_definitions(-DHAVE_GETPROGNAME) | ||
| 243 | endif() | ||
| 244 | |||
| 245 | check_function_exists(syslog_r HAVE_SYSLOG_R) | ||
| 246 | if(HAVE_SYSLOG_R) | ||
| 247 | add_definitions(-DHAVE_SYSLOG_R) | ||
| 248 | endif() | ||
| 249 | |||
| 250 | check_function_exists(syslog HAVE_SYSLOG) | ||
| 251 | if(HAVE_SYSLOG) | ||
| 252 | add_definitions(-DHAVE_SYSLOG) | ||
| 253 | endif() | ||
| 254 | |||
| 240 | check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB) | 255 | check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB) |
| 241 | if(HAVE_TIMESPECSUB) | 256 | if(HAVE_TIMESPECSUB) |
| 242 | add_definitions(-DHAVE_TIMESPECSUB) | 257 | 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) | |||
| 807 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getpagesize.c) | 807 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getpagesize.c) |
| 808 | endif() | 808 | endif() |
| 809 | 809 | ||
| 810 | if(NOT HAVE_GETPROGNAME) | ||
| 811 | if(WIN32) | ||
| 812 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getprogname_windows.c) | ||
| 813 | elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") | ||
| 814 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getprogname_linux.c) | ||
| 815 | endif() | ||
| 816 | endif() | ||
| 817 | |||
| 810 | if(NOT HAVE_REALLOCARRAY) | 818 | if(NOT HAVE_REALLOCARRAY) |
| 811 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) | 819 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) |
| 812 | set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) | 820 | set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) |
| @@ -846,6 +854,10 @@ if(NOT HAVE_STRSEP) | |||
| 846 | set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) | 854 | set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) |
| 847 | endif() | 855 | endif() |
| 848 | 856 | ||
| 857 | if(NOT HAVE_SYSLOG_R) | ||
| 858 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/syslog_r.c) | ||
| 859 | endif() | ||
| 860 | |||
| 849 | if(NOT HAVE_TIMEGM) | 861 | if(NOT HAVE_TIMEGM) |
| 850 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/timegm.c) | 862 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/timegm.c) |
| 851 | set(EXTRA_EXPORT ${EXTRA_EXPORT} timegm) | 863 | 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) | |||
| 18 | TLS_SRC | 18 | TLS_SRC |
| 19 | ${TLS_SRC} | 19 | ${TLS_SRC} |
| 20 | compat/ftruncate.c | 20 | compat/ftruncate.c |
| 21 | compat/getuid.c | ||
| 22 | compat/pread.c | 21 | compat/pread.c |
| 23 | compat/pwrite.c | 22 | compat/pwrite.c |
| 24 | ) | 23 | ) |