summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMladen Turk <mturk@apache.org>2021-12-03 03:52:49 +0000
committerMladen Turk <mturk@apache.org>2021-12-03 03:52:49 +0000
commit88913b3b492085d42087b7ec142e7bf5160ac1d7 (patch)
treeddea504bca0a395fffdc4511801b46298fca759b /CMakeLists.txt
parent8beade7b5dc9faab9a0f3d45f1d970a31f138d68 (diff)
downloadapr-88913b3b492085d42087b7ec142e7bf5160ac1d7.tar.gz
Use standard configure options for dbd ODBC
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895523 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3eff1f436..e8b86fb80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,7 @@ SET(apu_use_libxml2_10 0)
SET(apu_use_expat_10 0)
SET(apu_use_xmllite_10 0)
SET(apu_have_iconv_10 0)
+SET(apu_have_odbc_10 0)
IF(APR_HAVE_IPV6)
SET(apr_have_ipv6_10 1)
@@ -111,6 +112,9 @@ ENDIF()
IF(APU_HAVE_ICONV)
SET(apu_have_iconv_10 1)
ENDIF()
+IF(APU_HAVE_ODBC)
+SET(apu_have_odbc_10 1)
+ENDIF()
CONFIGURE_FILE(include/apr.hwc
${PROJECT_BINARY_DIR}/apr.h)
@@ -507,7 +511,6 @@ 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_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()