diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.cmake | 3 | ||||
| -rw-r--r-- | libapr.rc | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20232cbcf..082d49434 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -435,6 +435,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\\\"\"") TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 libapr-2 ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES}) ENDIF() @@ -445,6 +446,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\\\"\"") ENDIF() IF(APR_BUILD_TESTAPR) diff --git a/README.cmake b/README.cmake index 8277298c2..d6948a5a4 100644 --- a/README.cmake +++ b/README.cmake @@ -144,9 +144,6 @@ Known Bugs and Limitations * APR-CHANGES.txt, APR-LICENSE.txt, and APR-NOTICE.txt are not installed, though perhaps that is a job for a higher-level script. * test/internal/testucs is not built. -* APR trunk's libapr.rc is missing the DLL_NAME switch from APR-util 1.x - (affects both Windows build systems), and the cmake build system isn't - setting it. Generally: @@ -14,7 +14,13 @@ "See the License for the specific language governing permissions and " \ "limitations under the License." +#ifdef DLL_NAME +#define APR_DLL_BASENAME APR_STRINGIFY(DLL_NAME) "-" APR_STRINGIFY(APR_MAJOR_VERSION) +#define APR_DLL_DESCRIPTION "Apache Portable Runtime " APR_STRINGIFY(DLL_NAME) " Module" +#else #define APR_DLL_BASENAME "libapr-" APR_STRINGIFY(APR_MAJOR_VERSION) +#define APR_DLL_DESCRIPTION "Apache Portable Runtime Library" +#endif 1 VERSIONINFO @@ -48,7 +54,7 @@ BEGIN BEGIN VALUE "Comments", APR_LICENSE "\0" VALUE "CompanyName", "Apache Software Foundation\0" - VALUE "FileDescription", "Apache Portable Runtime Library\0" + VALUE "FileDescription", APR_DLL_DESCRIPTION "\0" VALUE "FileVersion", APR_VERSION_STRING "\0" VALUE "InternalName", APR_DLL_BASENAME "\0" VALUE "LegalCopyright", APR_COPYRIGHT "\0" |