diff options
author | Mladen Turk <mturk@apache.org> | 2021-12-03 09:38:43 +0000 |
---|---|---|
committer | Mladen Turk <mturk@apache.org> | 2021-12-03 09:38:43 +0000 |
commit | 6445e8804008922f8018aa238aa4d6bba608c49a (patch) | |
tree | 89c7ea188de5a786a6f7df97cb9a5c47700452ce | |
parent | 82b5ffb560444018ae3bca533b196c9a5a5d0ae7 (diff) | |
download | apr-6445e8804008922f8018aa238aa4d6bba608c49a.tar.gz |
Do not install import libraries for DSO modules
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895541 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 97f39f568..7fee043dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -476,6 +476,7 @@ SET(APR_TEST_SOURCES ) SET(install_targets) +SET(install_modules) SET(install_bin_pdb) SET(dbd_drivers) @@ -508,7 +509,7 @@ IF(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_targets apr_crypto_openssl-2) + 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) TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES}) SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}") @@ -518,7 +519,7 @@ ENDIF() IF(APU_HAVE_ODBC) ADD_LIBRARY(apr_dbd_odbc-2 SHARED dbd/apr_dbd_odbc.c libapr.rc) - LIST(APPEND install_targets apr_dbd_odbc-2) + 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 dbd_drivers odbc) TARGET_LINK_LIBRARIES(apr_dbd_odbc-2 ${apr_libname} ${APR_SYSTEM_LIBS} odbc32 odbccp32) @@ -529,7 +530,7 @@ ENDIF() IF(APU_HAVE_SQLITE3) ADD_LIBRARY(apr_dbd_sqlite3-2 SHARED dbd/apr_dbd_sqlite3.c libapr.rc) - LIST(APPEND install_targets apr_dbd_sqlite3-2) + 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 dbd_drivers sqlite3) TARGET_LINK_LIBRARIES(apr_dbd_sqlite3-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${SQLite3_LIBRARIES}) @@ -661,6 +662,10 @@ INSTALL(TARGETS ${install_targets} ARCHIVE DESTINATION lib ) +# For DSO modules, install only binaries +INSTALL(FILES ${install_modules} + DESTINATION bin) + IF(INSTALL_PDB) INSTALL(FILES ${install_bin_pdb} DESTINATION bin |