svn commit: r1920435 - /apr/apr/branches/cmake-native-type/CMakeLists.txt

Author: ivan
Date: Tue Sep  3 14:24:28 2024
New Revision: 1920435

URL: http://svn.apache.org/viewvc?rev=1920435&view=rev
Log:
On the 'cmake-native-type' branch: CMake: Globally set APR_HAVE_MODULAR_DSO
for all targets.

Modified:
    apr/apr/branches/cmake-native-type/CMakeLists.txt

Modified: apr/apr/branches/cmake-native-type/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/cmake-native-type/CMakeLists.txt?rev=1920435&r1=1920434&r2=1920435&view=diff
==============================================================================
--- apr/apr/branches/cmake-native-type/CMakeLists.txt (original)
+++ apr/apr/branches/cmake-native-type/CMakeLists.txt Tue Sep  3 14:24:28 2024
@@ -111,12 +111,17 @@ IF(APR_POOL_DEBUG)
   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 @@ ELSE(APU_USE_XMLLITE)
   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 @@ IF (BUILD_SHARED_LIBS)
   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 @@ ELSE()
   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}