aboutsummaryrefslogtreecommitdiff
path: root/oracle
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-02-24 10:03:19 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-02-24 10:03:19 +0200
commit564700ab7c96b671b0c08a37e9a0e50f4b2fc176 (patch)
treedd698330f5b455597998e84972b96a7d15b5a53d /oracle
parent50b4de07844ca2a5781d7845115d7bd9e7c8f003 (diff)
C++11 support (pass --std ODB compiler option in build makefiles)
Diffstat (limited to 'oracle')
-rw-r--r--oracle/template/makefile5
-rw-r--r--oracle/types/makefile5
2 files changed, 10 insertions, 0 deletions
diff --git a/oracle/template/makefile b/oracle/template/makefile
index 35530bc..f3cf5e2 100644
--- a/oracle/template/makefile
+++ b/oracle/template/makefile
@@ -95,7 +95,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
$(call include,$(bld_root)/meta/vc10proj.make)
$(call include,$(bld_root)/meta/automake.make)
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
$(call include,$(odb_rules))
+endif
+
$(call include,$(bld_root)/cxx/cxx-d.make)
$(call include,$(bld_root)/cxx/cxx-o.make)
$(call include,$(bld_root)/cxx/o-e.make)
diff --git a/oracle/types/makefile b/oracle/types/makefile
index 89f8e0b..da385ea 100644
--- a/oracle/types/makefile
+++ b/oracle/types/makefile
@@ -97,7 +97,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
$(call include,$(bld_root)/meta/vc10proj.make)
$(call include,$(bld_root)/meta/automake.make)
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
$(call include,$(odb_rules))
+endif
+
$(call include,$(bld_root)/cxx/cxx-d.make)
$(call include,$(bld_root)/cxx/cxx-o.make)
$(call include,$(bld_root)/cxx/o-e.make)