C++11 support (pass --std ODB compiler option in build makefiles)

15 files changed, 75 insertions, 0 deletions

diff --git a/boost/makefile b/boost/makefile
index 6e9ff4a..aff6de1 100644
--- a/boost/makefile
+++ b/boost/makefile
@@ -123,7 +123,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/composite/makefile b/composite/makefile
index 024bf7e..40f72cf 100644
--- a/composite/makefile
+++ b/composite/makefile
@@ -106,7 +106,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/container/makefile b/container/makefile
index 41591b9..ab11e6a 100644
--- a/container/makefile
+++ b/container/makefile
@@ -106,7 +106,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/hello/makefile b/hello/makefile
index ad3d84a..02736b1 100644
--- a/hello/makefile
+++ b/hello/makefile
@@ -106,7 +106,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/inheritance/makefile b/inheritance/makefile
index e115a2f..7f66d28 100644
--- a/inheritance/makefile
+++ b/inheritance/makefile
@@ -106,7 +106,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/inverse/makefile b/inverse/makefile
index 50d0c5d..9eb0735 100644
--- a/inverse/makefile
+++ b/inverse/makefile
@@ -107,7 +107,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/mapping/makefile b/mapping/makefile
index de8669c..b6350a0 100644
--- a/mapping/makefile
+++ b/mapping/makefile
@@ -109,7 +109,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/optimistic/makefile b/optimistic/makefile
index 1c03c6b..dc200e8 100644
--- a/optimistic/makefile
+++ b/optimistic/makefile
@@ -106,7 +106,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/qt/makefile b/qt/makefile
index 48699c2..b798489 100644
--- a/qt/makefile
+++ b/qt/makefile
@@ -119,7 +119,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/query/makefile b/query/makefile
index 7a16d4e..5a96b5e 100644
--- a/query/makefile
+++ b/query/makefile
@@ -106,7 +106,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/relationship/makefile b/relationship/makefile
index 6b8b58a..1ef0722 100644
--- a/relationship/makefile
+++ b/relationship/makefile
@@ -107,7 +107,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/schema/custom/makefile b/schema/custom/makefile
index a609f03..3a8c69c 100644
--- a/schema/custom/makefile
+++ b/schema/custom/makefile
@@ -104,7 +104,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/schema/embedded/makefile b/schema/embedded/makefile
index 9c7c292..6d2b521 100644
--- a/schema/embedded/makefile
+++ b/schema/embedded/makefile
@@ -105,7 +105,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/template/makefile b/template/makefile
index 1dbd78d..e3051bc 100644
--- a/template/makefile
+++ b/template/makefile
@@ -106,7 +106,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/view/makefile b/view/makefile
index 5973060..641d4cd 100644
--- a/view/makefile
+++ b/view/makefile
@@ -107,7 +107,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)