svn commit: r1925670 - in /apr/apr-util/branches/1.7.x: ./ CMakeLists.txt

[iv...@apache.org]

Author: ivan
Date: Sun May 18 14:06:12 2025
New Revision: 1925670

URL: http://svn.apache.org/viewvc?rev=1925670&view=rev
Log:
Merge 1895541 and 1920431 from trunk:
  * Properly install modules to bin directory instead of lib.

Found by: Timofei Zhakov <tima chemodax.net>

Modified:
    apr/apr-util/branches/1.7.x/   (props changed)
    apr/apr-util/branches/1.7.x/CMakeLists.txt

Propchange: apr/apr-util/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1895541,1920431

Modified: apr/apr-util/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CMakeLists.txt?rev=1925670&r1=1925669&r2=1925670&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Sun May 18 14:06:12 2025
@@ -275,6 +275,7 @@ SET(APR_TEST_SUITES
 )
 
 SET(install_targets)
+SET(install_modules)
 SET(install_bin_pdb)
 SET(dbd_drivers)
 
@@ -287,7 +288,7 @@ ENDIF()
 MACRO(ADD_APU_MODULE name dllname sources libraries)
   IF(APU_DSO_BUILD)
     ADD_LIBRARY(${name} MODULE ${sources})
-    LIST(APPEND install_targets ${name})
+    LIST(APPEND install_modules ${name})
     LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:${name}>)
 
     TARGET_SOURCES(${name} PRIVATE libaprutil.rc)
@@ -441,6 +442,10 @@ INSTALL(TARGETS ${install_targets}
         ARCHIVE DESTINATION ${APU_INSTALL_LIB_DIR}
        )
 
+# For DSO modules, install only binaries
+INSTALL(TARGETS ${install_modules}
+        DESTINATION ${APU_INSTALL_BIN_DIR})
+
 IF(INSTALL_PDB)
   INSTALL(FILES ${install_bin_pdb}
           DESTINATION ${APU_INSTALL_BIN_DIR}