svn commit: r1920712 - in /apr/apr/trunk: CMakeLists.txt README.cmake include/apr.hwc

Author: ivan
Date: Mon Sep 16 11:01:28 2024
New Revision: 1920712

URL: http://svn.apache.org/viewvc?rev=1920712&view=rev
Log:
CMake: Add support to build PostgreSQL DBD driver.

Modified:
    apr/apr/trunk/CMakeLists.txt
    apr/apr/trunk/README.cmake
    apr/apr/trunk/include/apr.hwc

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1920712&r1=1920711&r2=1920712&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Mon Sep 16 11:01:28 2024
@@ -51,6 +51,7 @@ OPTION(APU_USE_LIBXML2      "Use LibXml2
 OPTION(APU_USE_XMLLITE      "Use XmlLite"                  ON)
 OPTION(APR_INSTALL_PRIVATE_H  "Install selected private .h files (for httpd)"  OFF)
 OPTION(APU_HAVE_SQLITE3     "Build SQLite3 DBD driver"     OFF)
+OPTION(APU_HAVE_PGSQL       "Build PostgreSQL DBD driver"  OFF)
 OPTION(APU_HAVE_CRYPTO      "Crypto support"               OFF)
 OPTION(APU_HAVE_ICONV       "Xlate support"                OFF)
 OPTION(APR_HAVE_IPV6        "IPv6 support"                 ON)
@@ -95,6 +96,10 @@ IF(APU_HAVE_SQLITE3)
   FIND_PACKAGE(SQLite3 REQUIRED)
 ENDIF()
 
+IF(APU_HAVE_PGSQL)
+  FIND_PACKAGE(PostgreSQL REQUIRED)
+ENDIF()
+
 IF(APR_POOL_DEBUG)
   ADD_COMPILE_DEFINITIONS(APR_POOL_DEBUG=1)
 ENDIF()
@@ -542,6 +547,16 @@ IF(APU_HAVE_SQLITE3)
   )
 ENDIF()
 
+IF(APU_HAVE_PGSQL)
+  LIST(APPEND dbd_drivers pgsql)
+
+  ADD_APR_MODULE(apr_dbd_pgsql-2 "apr_dbd_pgsql"
+                 "dbd/apr_dbd_pgsql.c"
+                 "PostgreSQL::PostgreSQL")
+
+  ADD_COMPILE_DEFINITIONS(HAVE_LIBPQ_FE_H)
+ENDIF()
+
 IF (BUILD_SHARED_LIBS)
   ADD_LIBRARY(${apr_libname} SHARED ${APR_SOURCES} ${APR_EXTRA_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
   LIST(APPEND install_targets ${apr_libname})
@@ -765,6 +780,7 @@ MESSAGE(STATUS "  C compiler ...........
 MESSAGE(STATUS "  IPv6 ............................ : ${APR_HAVE_IPV6}")
 MESSAGE(STATUS "  DBD ODBC driver ................. : ${APU_HAVE_ODBC}")
 MESSAGE(STATUS "  DBD SQLite3 driver .............. : ${APU_HAVE_SQLITE3}")
+MESSAGE(STATUS "  DBD PostgreSQL .................. : ${APU_HAVE_PGSQL}")
 MESSAGE(STATUS "  Use Expat ....................... : ${APU_USE_EXPAT}")
 MESSAGE(STATUS "  Use LibXml2 ..................... : ${APU_USE_LIBXML2}")
 MESSAGE(STATUS "  Use XmlLite ..................... : ${APU_USE_XMLLITE}")

Modified: apr/apr/trunk/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/trunk/README.cmake?rev=1920712&r1=1920711&r2=1920712&view=diff
==============================================================================
--- apr/apr/trunk/README.cmake (original)
+++ apr/apr/trunk/README.cmake Mon Sep 16 11:01:28 2024
@@ -58,6 +58,8 @@ How to build
                               Default: ON
        APU_HAVE_SQLITE3       Build SQLite3 DBD driver
                               Default: OFF
+       APU_HAVE_PGSQL         Build PostgreSQL DBD driver
+                              Default: OFF
        APR_HAVE_IPV6          Enable IPv6 support
                               Default: ON
        APR_BUILD_TESTAPR      Build APR test suite
@@ -115,7 +117,6 @@ Known Bugs and Limitations
     . APU_HAVE_NDBM
     . APU_HAVE_DB
   + DBD:
-    . APU_HAVE_PGSQL
     . APU_HAVE_MYSQL
     . APU_HAVE_SQLITE2
     . APU_HAVE_ORACLE

Modified: apr/apr/trunk/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hwc?rev=1920712&r1=1920711&r2=1920712&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hwc (original)
+++ apr/apr/trunk/include/apr.hwc Mon Sep 16 11:01:28 2024
@@ -650,7 +650,7 @@ typedef int apr_wait_t;
  *          are supported.  The driver builds enable
  *          these flags individually.
  */
-#define APU_HAVE_PGSQL          0
+#cmakedefine01 APU_HAVE_PGSQL
 #define APU_HAVE_MYSQL          0
 #cmakedefine01 APU_HAVE_SQLITE3
 #define APU_HAVE_SQLITE2        0