summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-03-13 11:38:39 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-03-13 11:38:39 +0100
commit104a2f6be4f90ddc8bf9e938c4cee17e17137b70 (patch)
tree4d6c547742c94faf1b05c2bbe9ee69ddbaeae6da /cpp/test
parentFixed ICE-6792 - Added support for connectionCached/locatorCacheTimeout QoS s... (diff)
downloadice-104a2f6be4f90ddc8bf9e938c4cee17e17137b70.tar.bz2
ice-104a2f6be4f90ddc8bf9e938c4cee17e17137b70.tar.xz
ice-104a2f6be4f90ddc8bf9e938c4cee17e17137b70.zip
Fixed ICE-7665 - fixed test/Ice/imple GNU make warning
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Ice/impl/Makefile.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/test/Ice/impl/Makefile.mk b/cpp/test/Ice/impl/Makefile.mk
index b9b1e3b0663..e814e47c2f9 100644
--- a/cpp/test/Ice/impl/Makefile.mk
+++ b/cpp/test/Ice/impl/Makefile.mk
@@ -22,11 +22,19 @@ $5_cppflags += -I$$($5_objdir)
$$($5_objects): $$($5_objdir)/$$($2_impl)I.cpp
+ifeq ($$(filter $$($5_objdir)/$$($2_impl)I.cpp,$$($1_impls)),)
+
$$($5_objdir)/$$($2_impl)I.cpp: $1/$$($2_impl).ice $(slice2cpp_path)
$(E) "Compiling $$< implementation"
$(Q)$(MKDIR) -p $$(*D)
$(Q)$(RM) $$(*).h $$(*).cpp
$(Q)$(slice2cpp_path) $$($2_sliceflags) $$(if $$(filter cpp11-%,$4),--impl-c++11,--impl-c++98) --output-dir $$(*D) $$<
+
+# Prevents warning if multiple configurations refer to $$($5_objdir)/$$($2_impl)I.cpp
+$1_impls += $$($5_objdir)/$$($2_impl)I.cpp
+
+endif
+
endif
endef