Skip to content

Commit

Permalink
Merged r1920432 from apr/trunk:
Browse files Browse the repository at this point in the history
* CMake: Fix installation PDB files with multi-config generators.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1920442 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Ivan Zhakov committed Sep 3, 2024
1 parent 229c921 commit 9a582fb
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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}")
Expand Down

0 comments on commit 9a582fb

Please sign in to comment.