[Pcre-svn] [1242] code/trunk: Check for secure_getenv() and …

Page principale
Supprimer ce message
Auteur: Subversion repository
Date:  
À: pcre-svn
Sujet: [Pcre-svn] [1242] code/trunk: Check for secure_getenv() and strerror() in CMake build.
Revision: 1242
          http://www.exim.org/viewvc/pcre2?view=rev&revision=1242
Author:   ph10
Date:     2020-04-09 16:25:14 +0100 (Thu, 09 Apr 2020)
Log Message:
-----------
Check for secure_getenv() and strerror() in CMake build.


Modified Paths:
--------------
    code/trunk/CMakeLists.txt
    code/trunk/ChangeLog
    code/trunk/config-cmake.h.in


Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt    2020-04-01 17:00:33 UTC (rev 1241)
+++ code/trunk/CMakeLists.txt    2020-04-09 15:25:14 UTC (rev 1242)
@@ -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(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
#

Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2020-04-01 17:00:33 UTC (rev 1241)
+++ code/trunk/ChangeLog    2020-04-09 15:25:14 UTC (rev 1242)
@@ -99,7 +99,9 @@


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
------------------------------


Modified: code/trunk/config-cmake.h.in
===================================================================
--- code/trunk/config-cmake.h.in    2020-04-01 17:00:33 UTC (rev 1241)
+++ code/trunk/config-cmake.h.in    2020-04-09 15:25:14 UTC (rev 1242)
@@ -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