diff options
| author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-04-09 15:25:14 +0000 |
|---|---|---|
| committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-04-09 15:25:14 +0000 |
| commit | 68b6918b2c1c339295f76996af53697a4e9b0b57 (patch) | |
| tree | a0b0a24632db73cc6ddef13b5e768000fa24e2e0 | |
| parent | 265489fe6082dc2ba2c91ffdc1d448ed35739e60 (diff) | |
| download | pcre2-68b6918b2c1c339295f76996af53697a4e9b0b57.tar.gz | |
Check for secure_getenv() and strerror() in CMake build.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1242 6239d852-aaf2-0410-a92c-79f79f948069
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | config-cmake.h.in | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a033877..301a713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ # CMakeLists.txt # -# # This file enables PCRE2 to be built with the CMake configuration and build # tool. Download CMake in source or binary form from http://www.cmake.org/ # Converted to support PCRE2 from the original PCRE file, August 2014. @@ -87,6 +86,7 @@ # 2019-02-16 PH hacked to avoid CMP0026 policy issue (see comments below) # 2020-03-16 PH renamed dftables as pcre2_dftables (as elsewhere) # 2020-03-24 PH changed CMAKE_MODULE_PATH definition to add, not replace +# 2020-04-08 Carlo added function check for secure_getenv, fixed strerror PROJECT(PCRE2 C) @@ -125,9 +125,10 @@ CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) -CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) -CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) -CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) +CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) +CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) +CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) +CHECK_FUNCTION_EXISTS(secure_getenv HAVE_SECURE_GETENV) # User-configurable options # @@ -99,6 +99,8 @@ LIST(APPEND...) to allow a setting from the command line to be included. 23. Updated to Unicode 13.0.0. +24. CMake build now checks for secure_getenv() and strerror(). Patch by Carlo. + Version 10.34 21-November-2019 ------------------------------ diff --git a/config-cmake.h.in b/config-cmake.h.in index 529b009..108f86c 100644 --- a/config-cmake.h.in +++ b/config-cmake.h.in @@ -11,6 +11,8 @@ #cmakedefine HAVE_BCOPY 1 #cmakedefine HAVE_MEMMOVE 1 +#cmakedefine HAVE_STRERROR 1 +#cmakedefine HAVE_SECURE_GETENV 1 #cmakedefine PCRE2_STATIC 1 |