summaryrefslogtreecommitdiff
path: root/cpp/src/icegriddb
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-10-04 16:22:32 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-10-04 16:22:32 +0200
commit56918f132976cffb16a68f3757036e5e770fcb4a (patch)
tree6a3666fcfd768d733447e1b6063c2eda5e06abfa /cpp/src/icegriddb
parentFixed ICE-7351 -- removed --harmony flag for NodeJS tests (diff)
downloadice-56918f132976cffb16a68f3757036e5e770fcb4a.tar.bz2
ice-56918f132976cffb16a68f3757036e5e770fcb4a.tar.xz
ice-56918f132976cffb16a68f3757036e5e770fcb4a.zip
Fixed ICE-7346 - removed lmdb dependency, set cppflags instead if necessary
Diffstat (limited to 'cpp/src/icegriddb')
-rw-r--r--cpp/src/icegriddb/Makefile.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
index e021aeda53f..7150b79492d 100644
--- a/cpp/src/icegriddb/Makefile.mk
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -16,9 +16,8 @@ $(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h
icegriddb_targetdir := $(bindir)
icegriddb_dependencies := Ice IceDB Glacier2
-icegriddb_libs := lmdb
+icegriddb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir))
icegriddb_sources := $(addprefix $(slicedir)/IceGrid/,Descriptor.ice Exception.ice) \
$(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice)
-
projects += $(project)