svn commit: r1920444 - in /apr/apr-util/branches/1.7.x: ./ CMakeLists.txt
| Newsgroups | gmane.comp.apache.apr.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ivan
Date: Tue Sep 3 16:40:01 2024
New Revision: 1920444
URL: http://svn.apache.org/viewvc?rev=1920444&view=rev
Log:
Merged r1920441 from apr/trunk:
* CMake: Remove /exports link flag for modules, because modules use
APR_MODULE_DECLARE_DATA to export modules.
Modified:
apr/apr-util/branches/1.7.x/ (props changed)
apr/apr-util/branches/1.7.x/CMakeLists.txt
Propchange: apr/apr-util/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1920441
Modified: apr/apr-util/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CMakeLists.txt?rev=1920444&r1=1920443&r2=1920444&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Tue Sep 3 16:40:01 2024
@@ -358,8 +358,6 @@ IF(APU_DSO_BUILD AND APU_HAVE_ODBC)
LIST(APPEND dbd_drivers odbc)
TARGET_LINK_LIBRARIES(apr_dbd_odbc-1
PRIVATE libaprutil-1 apr::libapr-1 odbc32 odbccp32)
- TARGET_LINK_OPTIONS(apr_dbd_odbc-1
- PRIVATE "/export:apr_dbd_odbc_driver")
TARGET_COMPILE_DEFINITIONS(apr_dbd_odbc-1
PRIVATE "DLL_NAME=apr_dbd_odbc")
ENDIF()
@@ -387,8 +385,6 @@ IF(APU_DSO_BUILD AND APU_HAVE_SQLITE3)
PRIVATE "${SQLite3_INCLUDE_DIRS}")
TARGET_LINK_LIBRARIES(apr_dbd_sqlite3-1
PRIVATE libaprutil-1 apr::libapr-1 ${SQLite3_LIBRARIES})
- TARGET_LINK_OPTIONS(apr_dbd_sqlite3-1
- PRIVATE "/export:apr_dbd_sqlite3_driver")
TARGET_COMPILE_DEFINITIONS(apr_dbd_sqlite3-1
PRIVATE "DLL_NAME=apr_dbd_sqlite3-1")
ENDIF()