diff options
| author | Jeff Trawick <trawick@apache.org> | 2013-11-19 12:22:15 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2013-11-19 12:22:15 +0000 |
| commit | e864d3a8603a8a210f3d1e1eaece36207899f899 (patch) | |
| tree | 8235c2431cc591419565354662c8e093d63d2c34 /CMakeLists.txt | |
| parent | 1124cb2ff813ededb7a10936e74ce4ad1efa8650 (diff) | |
| download | apr-e864d3a8603a8a210f3d1e1eaece36207899f899.tar.gz | |
Make DLL_NAME definition compatible with Visual Studio generators by removing unnecessary
escaped quoting.
Diagnosis and earlier patch by rhuijben
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1543399 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bb983b8eb..f6a149929 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -449,7 +449,7 @@ IF(APU_HAVE_CRYPTO) SET(install_targets ${install_targets} apr_crypto_openssl-2) SET(install_bin_pdb ${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\\\"\"") + SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_crypto_openssl") TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 libapr-2 ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES}) ENDIF() @@ -461,7 +461,7 @@ IF(APU_HAVE_ODBC) TARGET_LINK_LIBRARIES(apr_dbd_odbc-2 libapr-2 ${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_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD") - SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=\"\\\"apr_dbd_odbc\\\"\"") + SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_odbc") ENDIF() IF(APR_BUILD_TESTAPR) |