commit 0004bfa3e2fe8f8e183b6bdd522f87d964e7193c
author Ivan Zhakov <ivan@apache.org> Tue Sep 03 14:24:28 2024 +0000
committer Ivan Zhakov <ivan@apache.org> Tue Sep 03 14:24:28 2024 +0000
tree c34491c44856a002493b87d975f4b65de3c5171e
parent f7b670e8c8b4b901877c3dd3f575afc8fcf50014

On the 'cmake-native-type' branch: CMake: Globally set APR_HAVE_MODULAR_DSO
for all targets.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/cmake-native-type@1920435 13f79535-47bb-0310-9956-ffa450edef68

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75d987a..933cb5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,12 +111,17 @@
   ADD_COMPILE_DEFINITIONS(APR_POOL_DEBUG=1)
 ENDIF()
 
+IF(APR_MODULAR_DSO)
+  ADD_COMPILE_DEFINITIONS(APR_HAVE_MODULAR_DSO=1)
+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)
-SET(apr_have_modular_dso_10 0)
 
 IF(APU_USE_EXPAT)
   SET(apu_use_expat_10 1)
@@ -126,10 +131,6 @@
   SET(apu_use_xmllite_10 1)
 ENDIF()
 
-IF(APR_MODULAR_DSO)
-  SET(apr_have_modular_dso_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)")
 
@@ -535,7 +536,7 @@
   TARGET_LINK_LIBRARIES(${apr_libname}
                         PRIVATE ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS} ${APR_EXTRA_LIBRARIES})
   TARGET_COMPILE_DEFINITIONS(${apr_libname}
-                             PRIVATE "APR_DECLARE_EXPORT;APR_HAVE_MODULAR_DSO=${apr_have_modular_dso_10}"
+                             PRIVATE "APR_DECLARE_EXPORT"
                              INTERFACE "APR_DECLARE_IMPORT")
   TARGET_INCLUDE_DIRECTORIES(${apr_libname}
     PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR} ${APR_EXTRA_INCLUDE_DIRECTORIES}
@@ -549,7 +550,7 @@
   TARGET_LINK_LIBRARIES(${apr_libname}
                         PRIVATE ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS} ${APR_EXTRA_LIBRARIES})
   TARGET_COMPILE_DEFINITIONS(${apr_libname}
-                             PRIVATE "APR_DECLARE_STATIC;APR_HAVE_MODULAR_DSO=${apr_have_modular_dso_10}"
+                             PRIVATE "APR_DECLARE_STATIC"
                              INTERFACE "APR_DECLARE_STATIC")
   TARGET_INCLUDE_DIRECTORIES(${apr_libname}
     PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR} ${APR_EXTRA_INCLUDE_DIRECTORIES}