svn commit: r1920851 - in /apr/apr/trunk: CMakeLists.txt include/apr.hwc

Author: ivan
Date: Mon Sep 23 08:55:06 2024
New Revision: 1920851

URL: http://svn.apache.org/viewvc?rev=1920851&view=rev
Log:
CMake: Use #cmakedefine01 for APU_USE_EXPAT, APU_USE_LIBXML2 and APU_USE_XMLLITE.

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

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1920851&r1=1920850&r2=1920851&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Mon Sep 23 08:55:06 2024
@@ -110,20 +110,6 @@ ELSE()
   ADD_COMPILE_DEFINITIONS(APR_HAVE_MODULAR_DSO=0)
 ENDIF()
 
-# create 1-or-0 representation of feature tests for apr.h
-
-SET(apu_use_libxml2_10 0)
-SET(apu_use_expat_10 0)
-SET(apu_use_xmllite_10 0)
-
-IF(APU_USE_EXPAT)
-  SET(apu_use_expat_10 1)
-ELSEIF(APU_USE_LIBXML2)
-  SET(apu_use_libxml2_10 1)
-ELSE(APU_USE_XMLLITE)
-  SET(apu_use_xmllite_10 1)
-ENDIF()
-
 # Read current version.
 FILE(STRINGS include/apr_version.h VERSION_STRINGS REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)")
 

Modified: apr/apr/trunk/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hwc?rev=1920851&r1=1920850&r2=1920851&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hwc (original)
+++ apr/apr/trunk/include/apr.hwc Mon Sep 23 08:55:06 2024
@@ -673,9 +673,9 @@ typedef int apr_wait_t;
 #cmakedefine01 APU_HAVE_ICONV
 #define APR_HAS_XLATE           (APU_HAVE_ICONV)
 
-#define APU_USE_EXPAT           @apu_use_expat_10@
-#define APU_USE_LIBXML2         @apu_use_libxml2_10@
-#define APU_USE_XMLLITE         @apu_use_xmllite_10@
+#cmakedefine01 APU_USE_EXPAT
+#cmakedefine01 APU_USE_LIBXML2
+#cmakedefine01 APU_USE_XMLLITE
 
 /** @} */