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

Author: ivan
Date: Tue Sep  3 13:50:26 2024
New Revision: 1920433

URL: http://svn.apache.org/viewvc?rev=1920433&view=rev
Log:
On the 'cmake-native-type' branch: Merge changes from trunk.

Modified:
    apr/apr/branches/cmake-native-type/   (props changed)
    apr/apr/branches/cmake-native-type/CMakeLists.txt

Propchange: apr/apr/branches/cmake-native-type/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1920427-1920432

Modified: apr/apr/branches/cmake-native-type/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/cmake-native-type/CMakeLists.txt?rev=1920433&r1=1920432&r2=1920433&view=diff
==============================================================================
--- apr/apr/branches/cmake-native-type/CMakeLists.txt (original)
+++ apr/apr/branches/cmake-native-type/CMakeLists.txt Tue Sep  3 13:50:26 2024
@@ -531,7 +531,7 @@ 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})
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/${apr_libname}.pdb)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:${apr_libname}>)
   TARGET_LINK_LIBRARIES(${apr_libname}
                         PRIVATE ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS} ${APR_EXTRA_LIBRARIES})
   TARGET_COMPILE_DEFINITIONS(${apr_libname}
@@ -579,8 +579,8 @@ IF(APR_MODULAR_DSO AND APU_HAVE_CRYPTO)
     MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
   ENDIF()
   ADD_LIBRARY(apr_crypto_openssl-2 SHARED crypto/apr_crypto_openssl.c libapr.rc)
-  LIST(APPEND install_modules ${PROJECT_BINARY_DIR}/apr_crypto_openssl-2.dll)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_crypto_openssl-2.pdb)
+  LIST(APPEND install_modules apr_crypto_openssl-2)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_crypto_openssl-2>)
   TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES})
   SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
   TARGET_COMPILE_DEFINITIONS(apr_crypto_openssl-2
@@ -589,8 +589,8 @@ ENDIF()
 
 IF(APR_MODULAR_DSO AND APU_HAVE_ODBC)
   ADD_LIBRARY(apr_dbd_odbc-2 SHARED dbd/apr_dbd_odbc.c libapr.rc)
-  LIST(APPEND install_modules ${PROJECT_BINARY_DIR}/apr_dbd_odbc-2.dll)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_dbd_odbc-2.pdb)
+  LIST(APPEND install_modules apr_dbd_odbc-2)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_dbd_odbc-2>)
   LIST(APPEND dbd_drivers odbc)
   TARGET_LINK_LIBRARIES(apr_dbd_odbc-2 ${apr_libname} ${APR_SYSTEM_LIBS} odbc32 odbccp32)
   SET_PROPERTY(TARGET apr_dbd_odbc-2 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
@@ -600,8 +600,8 @@ ENDIF()
 
 IF(APR_MODULAR_DSO AND APU_HAVE_SQLITE3)
   ADD_LIBRARY(apr_dbd_sqlite3-2 SHARED dbd/apr_dbd_sqlite3.c libapr.rc)
-  LIST(APPEND install_modules ${PROJECT_BINARY_DIR}/apr_dbd_sqlite3-2.dll)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_dbd_sqlite3-2.pdb)
+  LIST(APPEND install_modules apr_dbd_sqlite3-2)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_dbd_sqlite3-2>)
   LIST(APPEND dbd_drivers sqlite3)
   TARGET_LINK_LIBRARIES(apr_dbd_sqlite3-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${SQLite3_LIBRARIES})
   SET_PROPERTY(TARGET apr_dbd_sqlite3-2 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_sqlite3_driver)
@@ -749,7 +749,8 @@ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DI
 )
 
 # For DSO modules, install only binaries
-INSTALL(FILES ${install_modules}
+INSTALL(TARGETS ${install_modules}
+        COMPONENT RUNTIME
         DESTINATION ${APR_INSTALL_BIN_DIR})
 
 IF(INSTALL_PDB)