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

Author: ivan
Date: Tue Sep  3 16:33:33 2024
New Revision: 1920442

URL: http://svn.apache.org/viewvc?rev=1920442&view=rev
Log:
Merged r1920432 from apr/trunk:
* CMake: Fix installation PDB files with multi-config generators.

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:r1920432

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=1920442&r1=1920441&r2=1920442&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Tue Sep  3 16:33:33 2024
@@ -314,7 +314,7 @@ ENDIF()
 IF(APU_BUILD_SHARED)
   ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APU_EXTRA_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
   LIST(APPEND install_targets libaprutil-1)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:libaprutil-1>)
   TARGET_LINK_LIBRARIES(libaprutil-1
                         PRIVATE apr::libapr-1 ${XMLLIB_LIBRARIES} ${APU_EXTRA_LIBRARIES})
   TARGET_INCLUDE_DIRECTORIES(libaprutil-1
@@ -342,7 +342,7 @@ IF(APU_DSO_BUILD AND APU_HAVE_CRYPTO)
   ENDIF()
   ADD_LIBRARY(apr_crypto_openssl-1 SHARED crypto/apr_crypto_openssl.c libaprutil.rc)
   LIST(APPEND install_targets apr_crypto_openssl-1)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_crypto_openssl-1>)
   TARGET_INCLUDE_DIRECTORIES(apr_crypto_openssl-1
                              PRIVATE "${OPENSSL_INCLUDE_DIR}")
   TARGET_COMPILE_DEFINITIONS(apr_crypto_openssl-1
@@ -354,7 +354,7 @@ ENDIF()
 IF(APU_DSO_BUILD AND APU_HAVE_ODBC)
   ADD_LIBRARY(apr_dbd_odbc-1 SHARED dbd/apr_dbd_odbc.c libaprutil.rc)
   LIST(APPEND install_targets apr_dbd_odbc-1)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_dbd_odbc-1.pdb)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_dbd_odbc-1>)
   LIST(APPEND dbd_drivers odbc)
   TARGET_LINK_LIBRARIES(apr_dbd_odbc-1
                         PRIVATE libaprutil-1 apr::libapr-1 odbc32 odbccp32)
@@ -368,7 +368,7 @@ IF(APU_DSO_BUILD AND APR_HAS_LDAP)
   ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c 
               ldap/apr_ldap_rebind.c libaprutil.rc)
   LIST(APPEND install_targets apr_ldap-1)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_ldap-1>)
   TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1
                         PRIVATE apr::libapr-1 ${LDAP_LIBRARIES})
   TARGET_COMPILE_DEFINITIONS(apr_ldap-1
@@ -381,7 +381,7 @@ ENDIF()
 IF(APU_DSO_BUILD AND APU_HAVE_SQLITE3)
   ADD_LIBRARY(apr_dbd_sqlite3-1 SHARED dbd/apr_dbd_sqlite3.c libaprutil.rc)
   LIST(APPEND install_targets apr_dbd_sqlite3-1)
-  LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_dbd_sqlite3-1.pdb)
+  LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_dbd_sqlite3-1>)
   LIST(APPEND dbd_drivers sqlite3)
   TARGET_INCLUDE_DIRECTORIES(apr_dbd_sqlite3-1
                              PRIVATE "${SQLite3_INCLUDE_DIRS}")