Fix module names and use CMake's LIST APPEND instead using SET(foo ${foo} ...

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895519 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53f182605..b48edf082 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -473,7 +473,7 @@ SET_TARGET_PROPERTIES(${apr_libname} PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE
 ADD_DEPENDENCIES(${apr_libname} test_char_header)
 
 ADD_LIBRARY(${apr_name} STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
-SET(install_targets ${install_targets} ${apr_name})
+LIST(APPEND install_targets ${apr_name})
 # no .pdb file generated for static libraries
 TARGET_LINK_LIBRARIES(${apr_name} ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(${apr_name} PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_HAVE_MODULAR_DSO")
@@ -481,34 +481,34 @@ ADD_DEPENDENCIES(${apr_name} test_char_header)
 
 # libaprapp-2 and aprapp-2 are static
 ADD_LIBRARY(libaprapp-2 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
-SET(install_targets ${install_targets} libaprapp-2)
+LIST(APPEND install_targets libaprapp-2)
 SET_TARGET_PROPERTIES(libaprapp-2 PROPERTIES COMPILE_DEFINITIONS APR_APP)
 
 ADD_LIBRARY(aprapp-2 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
-SET(install_targets ${install_targets} aprapp-2)
+LIST(APPEND install_targets aprapp-2)
 SET_TARGET_PROPERTIES(aprapp-2 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP")
 
 IF(APU_HAVE_CRYPTO)
   IF(NOT OPENSSL_FOUND)
     MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
   ENDIF()
-  ADD_LIBRARY(${apr_libname}_crypto_openssl SHARED crypto/apr_crypto_openssl.c libapr.rc)
-  SET(install_targets ${install_targets} ${apr_libname}_crypto_openssl)
-  SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/${apr_libname}_crypto_openssl.pdb)
-  SET_TARGET_PROPERTIES(${apr_libname}_crypto_openssl PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
-  SET_TARGET_PROPERTIES(${apr_libname}_crypto_openssl PROPERTIES COMPILE_FLAGS "-DDLL_NAME=libapr-2_crypto_openssl")
-  TARGET_LINK_LIBRARIES(${apr_libname}_crypto_openssl ${apr_libname} ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES})
+  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_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")
+  TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES})
 ENDIF()
 
 IF(APU_HAVE_ODBC)
-  ADD_LIBRARY(${apr_libname}_dbd_odbc SHARED dbd/apr_dbd_odbc.c libapr.rc)
-  SET(install_targets ${install_targets} ${apr_libname}_dbd_odbc)
-  SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/${apr_libname}_dbd_odbc.pdb)
-  SET(dbd_drivers ${dbd_drivers} odbc)
-  TARGET_LINK_LIBRARIES(${apr_libname}_dbd_odbc ${apr_libname} ${APR_SYSTEM_LIBS} odbc32 odbccp32)
-  SET_PROPERTY(TARGET ${apr_libname}_dbd_odbc APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
-  SET_TARGET_PROPERTIES(${apr_libname}_dbd_odbc PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DSO_MODULE_BUILD")
-  SET_TARGET_PROPERTIES(${apr_libname}_dbd_odbc PROPERTIES COMPILE_FLAGS "-DDLL_NAME=libapr-2_dbd_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_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)
+  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;APU_DSO_MODULE_BUILD")
+  SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_odbc-2")
 ENDIF()
 
 IF(APR_BUILD_TESTAPR)