diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-10-04 16:22:32 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-10-04 16:22:32 +0200 |
| commit | 56918f132976cffb16a68f3757036e5e770fcb4a (patch) | |
| tree | 6a3666fcfd768d733447e1b6063c2eda5e06abfa | |
| parent | Fixed ICE-7351 -- removed --harmony flag for NodeJS tests (diff) | |
| download | ice-56918f132976cffb16a68f3757036e5e770fcb4a.tar.bz2 ice-56918f132976cffb16a68f3757036e5e770fcb4a.tar.xz ice-56918f132976cffb16a68f3757036e5e770fcb4a.zip | |
Fixed ICE-7346 - removed lmdb dependency, set cppflags instead if necessary
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mk | 4 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mk | 4 | ||||
| -rw-r--r-- | cpp/src/icegriddb/Makefile.mk | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index 6bbae208ab9..0e7193177dc 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -72,11 +72,11 @@ $(project)_targetdir := $(bindir) icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB -icegridnode_libs := lmdb +icegridnode_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) -icegridregistry_libs := lmdb +icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icegridadmin_dependencies := IcePatch2 IceBox IceXML icegridadmin_sources := $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice \ diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk index cbed5440bb7..0bdd56888e4 100644 --- a/cpp/src/IceStorm/Makefile.mk +++ b/cpp/src/IceStorm/Makefile.mk @@ -15,7 +15,7 @@ $(project)_dependencies := IceStorm Ice IceStormService_targetdir := $(libdir) IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB -IceStormService_libs := lmdb +IceStormService_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ InstrumentationI.cpp \ NodeI.cpp \ @@ -48,7 +48,7 @@ icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ icestormdb_targetdir := $(bindir) icestormdb_dependencies := IcePatch2 IceDB -icestormdb_libs := lmdb +icestormdb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) projects += $(project) 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) |