diff options
| author | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2021-12-03 04:34:57 +0000 |
|---|---|---|
| committer | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2021-12-03 04:34:57 +0000 |
| commit | 17c9c8fa2a44c5685f7e66ff0948e90ce8ea0b7c (patch) | |
| tree | cd10aabf44d6feeacd831304b0dc4fbba653c789 | |
| parent | 30a81836c47323513589fe39878aa9cd1eb8aedf (diff) | |
| download | libapr-17c9c8fa2a44c5685f7e66ff0948e90ce8ea0b7c.tar.gz | |
libapr.rc already appends -2 suffix to DLL_NAME
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895527 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 17b2869b3..125a7231a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -511,7 +511,7 @@ IF(APU_HAVE_CRYPTO) LIST(APPEND install_targets apr_crypto_openssl-2) LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/apr_crypto_openssl-2.pdb) SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}") - SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_crypto_openssl-2") + SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_crypto_openssl") TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES}) ENDIF() @@ -522,7 +522,7 @@ IF(APU_HAVE_ODBC) 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) - SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_odbc-2") + SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_odbc") ENDIF() IF(APU_HAVE_SQLITE3) @@ -533,7 +533,7 @@ IF(APU_HAVE_SQLITE3) SET_TARGET_PROPERTIES(apr_dbd_sqlite3-2 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${SQLite3_INCLUDE_DIRS}") 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) - SET_TARGET_PROPERTIES(apr_dbd_sqlite3-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_sqlite3-2") + SET_TARGET_PROPERTIES(apr_dbd_sqlite3-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_sqlite3") ENDIF() IF(APR_BUILD_TESTAPR) |