summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2020-01-25 12:21:59 -0500
committerAllen Winter <allen.winter@kdab.com>2020-01-25 12:21:59 -0500
commitac4488bcf0c51cf60b1ee769083e3d1095717d1e (patch)
treeb5881fa0cc6379739087e1a96b530142597ea470
parent85847d9496a03555be7bd05f0ceb283c287c50a4 (diff)
downloadlibical-git-ac4488bcf0c51cf60b1ee769083e3d1095717d1e.tar.gz
various - better fix or defining DB_DBM_HSEARCH
-rw-r--r--src/libicalss/CMakeLists.txt1
-rw-r--r--src/libicalss/icalbdbset.h1
-rw-r--r--src/libicalss/icalbdbsetimpl.h1
-rw-r--r--src/test/CMakeLists.txt1
4 files changed, 3 insertions, 1 deletions
diff --git a/src/libicalss/CMakeLists.txt b/src/libicalss/CMakeLists.txt
index eecd65da..1d4346bd 100644
--- a/src/libicalss/CMakeLists.txt
+++ b/src/libicalss/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/libical
)
if(BDB_FOUND)
- add_definitions(-DDB_DBM_HSEARCH=0) #set to 1 if hsearch support is needed
include_directories(${BDB_INCLUDE_DIR})
endif()
diff --git a/src/libicalss/icalbdbset.h b/src/libicalss/icalbdbset.h
index f7e3b880..422d8e45 100644
--- a/src/libicalss/icalbdbset.h
+++ b/src/libicalss/icalbdbset.h
@@ -21,6 +21,7 @@
#include "libical_icalss_export.h"
#include "icalset.h"
+#define DB_DBM_HSEARCH 0 //set to 1 if hsearch support is needed
#include <db.h>
typedef struct icalbdbset_impl icalbdbset;
diff --git a/src/libicalss/icalbdbsetimpl.h b/src/libicalss/icalbdbsetimpl.h
index a5a60a47..bd3c5f40 100644
--- a/src/libicalss/icalbdbsetimpl.h
+++ b/src/libicalss/icalbdbsetimpl.h
@@ -19,6 +19,7 @@
#define ICALBDBSETIMPL_H
#include "icalset.h"
+#define DB_DBM_HSEARCH 0 //set to 1 if hsearch support is needed
#include <db.h>
/* This definition is in its own file so it can be kept out of the
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 8ba9e1ee..91f16391 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -12,6 +12,7 @@ if(ICU_FOUND)
endif()
if(BDB_FOUND)
+ add_definitions(-DDB_DBM_HSEARCH=0) #set to 1 if hsearch support is needed
include_directories(${BDB_INCLUDE_DIR})
endif()