From 564700ab7c96b671b0c08a37e9a0e50f4b2fc176 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 24 Feb 2012 10:03:19 +0200 Subject: C++11 support (pass --std ODB compiler option in build makefiles) --- boost/common/optional/makefile | 5 +++++ boost/common/smart-ptr/makefile | 5 +++++ boost/common/template/makefile | 5 +++++ boost/common/unordered/makefile | 5 +++++ boost/mssql/date-time/makefile | 5 +++++ boost/mssql/template/makefile | 5 +++++ boost/mysql/date-time/makefile | 5 +++++ boost/mysql/template/makefile | 5 +++++ boost/oracle/date-time/makefile | 5 +++++ boost/oracle/template/makefile | 5 +++++ boost/pgsql/date-time/makefile | 5 +++++ boost/pgsql/template/makefile | 5 +++++ boost/sqlite/date-time/makefile | 5 +++++ boost/sqlite/template/makefile | 5 +++++ common/auto/makefile | 5 +++++ common/blob/makefile | 5 +++++ common/callback/makefile | 5 +++++ common/composite-id/makefile | 5 +++++ common/composite/makefile | 5 +++++ common/const-member/makefile | 5 +++++ common/const-object/makefile | 5 +++++ common/container/makefile | 5 +++++ common/ctor/makefile | 5 +++++ common/default/makefile | 5 +++++ common/enum/makefile | 5 +++++ common/erase-query/makefile | 5 +++++ common/include/makefile | 5 +++++ common/inheritance/makefile | 5 +++++ common/inverse/makefile | 5 +++++ common/lazy-ptr/makefile | 5 +++++ common/lifecycle/makefile | 5 +++++ common/no-id/makefile | 5 +++++ common/optimistic/makefile | 5 +++++ common/pragma/makefile | 5 +++++ common/query/makefile | 5 +++++ common/readonly/makefile | 5 +++++ common/relationship-query/makefile | 5 +++++ common/relationship/makefile | 6 +++++- common/schema/makefile | 5 +++++ common/template/makefile | 5 +++++ common/threads/makefile | 5 +++++ common/types/makefile | 5 +++++ common/view/makefile | 5 +++++ common/wrapper/makefile | 5 +++++ mssql/query/makefile | 5 +++++ mssql/template/makefile | 5 +++++ mssql/types/makefile | 5 +++++ mysql/template/makefile | 5 +++++ mysql/truncation/makefile | 5 +++++ mysql/types/makefile | 5 +++++ oracle/template/makefile | 5 +++++ oracle/types/makefile | 5 +++++ pgsql/template/makefile | 5 +++++ pgsql/truncation/makefile | 5 +++++ pgsql/types/makefile | 5 +++++ qt/common/containers/makefile | 5 +++++ qt/common/smart-ptr/makefile | 5 +++++ qt/common/template/makefile | 5 +++++ qt/mssql/basic/makefile | 5 +++++ qt/mssql/date-time/makefile | 5 +++++ qt/mssql/template/makefile | 5 +++++ qt/mysql/basic/makefile | 5 +++++ qt/mysql/date-time/makefile | 5 +++++ qt/mysql/template/makefile | 5 +++++ qt/oracle/basic/makefile | 5 +++++ qt/oracle/date-time/makefile | 5 +++++ qt/oracle/template/makefile | 5 +++++ qt/pgsql/basic/makefile | 5 +++++ qt/pgsql/date-time/makefile | 5 +++++ qt/pgsql/template/makefile | 5 +++++ qt/sqlite/basic/makefile | 5 +++++ qt/sqlite/date-time/makefile | 5 +++++ qt/sqlite/template/makefile | 5 +++++ sqlite/template/makefile | 5 +++++ sqlite/truncation/makefile | 5 +++++ sqlite/types/makefile | 5 +++++ 76 files changed, 380 insertions(+), 1 deletion(-) diff --git a/boost/common/optional/makefile b/boost/common/optional/makefile index 528823a..0b1866d 100644 --- a/boost/common/optional/makefile +++ b/boost/common/optional/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/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile index 8da77eb..920d3b3 100644 --- a/boost/common/smart-ptr/makefile +++ b/boost/common/smart-ptr/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/boost/common/template/makefile b/boost/common/template/makefile index 42dd770..363c730 100644 --- a/boost/common/template/makefile +++ b/boost/common/template/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/boost/common/unordered/makefile b/boost/common/unordered/makefile index ed78a2d..30603c6 100644 --- a/boost/common/unordered/makefile +++ b/boost/common/unordered/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/boost/mssql/date-time/makefile b/boost/mssql/date-time/makefile index 7713edc..ab68ca6 100644 --- a/boost/mssql/date-time/makefile +++ b/boost/mssql/date-time/makefile @@ -110,7 +110,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/boost/mssql/template/makefile b/boost/mssql/template/makefile index 184a324..19ff1db 100644 --- a/boost/mssql/template/makefile +++ b/boost/mssql/template/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/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile index 9d9449b..7889b7f 100644 --- a/boost/mysql/date-time/makefile +++ b/boost/mysql/date-time/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/boost/mysql/template/makefile b/boost/mysql/template/makefile index 875ca60..5ec5934 100644 --- a/boost/mysql/template/makefile +++ b/boost/mysql/template/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/boost/oracle/date-time/makefile b/boost/oracle/date-time/makefile index e1916b7..63ad18d 100644 --- a/boost/oracle/date-time/makefile +++ b/boost/oracle/date-time/makefile @@ -110,7 +110,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/boost/oracle/template/makefile b/boost/oracle/template/makefile index 87829d5..c813394 100644 --- a/boost/oracle/template/makefile +++ b/boost/oracle/template/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/boost/pgsql/date-time/makefile b/boost/pgsql/date-time/makefile index 4f79151..b1afc76 100644 --- a/boost/pgsql/date-time/makefile +++ b/boost/pgsql/date-time/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/boost/pgsql/template/makefile b/boost/pgsql/template/makefile index b97537c..db2426d 100644 --- a/boost/pgsql/template/makefile +++ b/boost/pgsql/template/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/boost/sqlite/date-time/makefile b/boost/sqlite/date-time/makefile index 377b0f6..b36f2b7 100644 --- a/boost/sqlite/date-time/makefile +++ b/boost/sqlite/date-time/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/boost/sqlite/template/makefile b/boost/sqlite/template/makefile index b4bf588..c57dd91 100644 --- a/boost/sqlite/template/makefile +++ b/boost/sqlite/template/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/common/auto/makefile b/common/auto/makefile index f05d4cc..188267e 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -98,7 +98,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/common/blob/makefile b/common/blob/makefile index 7e0a789..5d1ac1c 100644 --- a/common/blob/makefile +++ b/common/blob/makefile @@ -98,7 +98,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/common/callback/makefile b/common/callback/makefile index 37f4cd4..0c85d05 100644 --- a/common/callback/makefile +++ b/common/callback/makefile @@ -98,7 +98,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/common/composite-id/makefile b/common/composite-id/makefile index 774b8c7..a10dd57 100644 --- a/common/composite-id/makefile +++ b/common/composite-id/makefile @@ -98,7 +98,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/common/composite/makefile b/common/composite/makefile index 4bac352..602a9ab 100644 --- a/common/composite/makefile +++ b/common/composite/makefile @@ -98,7 +98,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/common/const-member/makefile b/common/const-member/makefile index 45c4a6b..1c22843 100644 --- a/common/const-member/makefile +++ b/common/const-member/makefile @@ -98,7 +98,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/common/const-object/makefile b/common/const-object/makefile index d335d43..47d9a0b 100644 --- a/common/const-object/makefile +++ b/common/const-object/makefile @@ -98,7 +98,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/common/container/makefile b/common/container/makefile index 6c17fcf..b81b891 100644 --- a/common/container/makefile +++ b/common/container/makefile @@ -98,7 +98,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/common/ctor/makefile b/common/ctor/makefile index f38995c..abcb78c 100644 --- a/common/ctor/makefile +++ b/common/ctor/makefile @@ -98,7 +98,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/common/default/makefile b/common/default/makefile index c8e6b31..ad2010a 100644 --- a/common/default/makefile +++ b/common/default/makefile @@ -98,7 +98,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/common/enum/makefile b/common/enum/makefile index 3d9aeba..f22da16 100644 --- a/common/enum/makefile +++ b/common/enum/makefile @@ -98,7 +98,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/common/erase-query/makefile b/common/erase-query/makefile index 04483f9..5fc5305 100644 --- a/common/erase-query/makefile +++ b/common/erase-query/makefile @@ -98,7 +98,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/common/include/makefile b/common/include/makefile index fa392c7..7320605 100644 --- a/common/include/makefile +++ b/common/include/makefile @@ -80,7 +80,12 @@ endif # How to. # +$(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/common/inheritance/makefile b/common/inheritance/makefile index 633801c..26d27eb 100644 --- a/common/inheritance/makefile +++ b/common/inheritance/makefile @@ -98,7 +98,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/common/inverse/makefile b/common/inverse/makefile index d229c3d..30bd265 100644 --- a/common/inverse/makefile +++ b/common/inverse/makefile @@ -98,7 +98,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/common/lazy-ptr/makefile b/common/lazy-ptr/makefile index 10d0faf..77053e3 100644 --- a/common/lazy-ptr/makefile +++ b/common/lazy-ptr/makefile @@ -98,7 +98,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/common/lifecycle/makefile b/common/lifecycle/makefile index 8304fe3..210bb46 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -98,7 +98,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/common/no-id/makefile b/common/no-id/makefile index c0ba422..9c6eeec 100644 --- a/common/no-id/makefile +++ b/common/no-id/makefile @@ -98,7 +98,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/common/optimistic/makefile b/common/optimistic/makefile index 5728a27..80e32f5 100644 --- a/common/optimistic/makefile +++ b/common/optimistic/makefile @@ -98,7 +98,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/common/pragma/makefile b/common/pragma/makefile index b44fc8d..09696c3 100644 --- a/common/pragma/makefile +++ b/common/pragma/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) diff --git a/common/query/makefile b/common/query/makefile index dfdd5bd..8d08b04 100644 --- a/common/query/makefile +++ b/common/query/makefile @@ -98,7 +98,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/common/readonly/makefile b/common/readonly/makefile index 713b035..4409927 100644 --- a/common/readonly/makefile +++ b/common/readonly/makefile @@ -98,7 +98,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/common/relationship-query/makefile b/common/relationship-query/makefile index b73cfe4..619cf8b 100644 --- a/common/relationship-query/makefile +++ b/common/relationship-query/makefile @@ -98,7 +98,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/common/relationship/makefile b/common/relationship/makefile index f422860..4a6425e 100644 --- a/common/relationship/makefile +++ b/common/relationship/makefile @@ -98,8 +98,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/common/schema/makefile b/common/schema/makefile index f221f06..9a3fb92 100644 --- a/common/schema/makefile +++ b/common/schema/makefile @@ -98,7 +98,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/common/template/makefile b/common/template/makefile index 0557801..bf28ba1 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -98,7 +98,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/common/threads/makefile b/common/threads/makefile index a87e47a..1c3550d 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -98,7 +98,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/common/types/makefile b/common/types/makefile index 28a3650..f81b56f 100644 --- a/common/types/makefile +++ b/common/types/makefile @@ -96,7 +96,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/common/view/makefile b/common/view/makefile index fb8155b..26566ce 100644 --- a/common/view/makefile +++ b/common/view/makefile @@ -98,7 +98,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/common/wrapper/makefile b/common/wrapper/makefile index 3ea462d..101ac93 100644 --- a/common/wrapper/makefile +++ b/common/wrapper/makefile @@ -98,7 +98,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/mssql/query/makefile b/mssql/query/makefile index 4fbaf08..f2eed97 100644 --- a/mssql/query/makefile +++ b/mssql/query/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/mssql/template/makefile b/mssql/template/makefile index f4e61c2..7a469b2 100644 --- a/mssql/template/makefile +++ b/mssql/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/mssql/types/makefile b/mssql/types/makefile index f44147c..195dd46 100644 --- a/mssql/types/makefile +++ b/mssql/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) diff --git a/mysql/template/makefile b/mysql/template/makefile index a5aacdd..b7175bc 100644 --- a/mysql/template/makefile +++ b/mysql/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/mysql/truncation/makefile b/mysql/truncation/makefile index 39c0a88..39ac0f3 100644 --- a/mysql/truncation/makefile +++ b/mysql/truncation/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/mysql/types/makefile b/mysql/types/makefile index da5b444..ccc8ee9 100644 --- a/mysql/types/makefile +++ b/mysql/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) 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) diff --git a/pgsql/template/makefile b/pgsql/template/makefile index 3682441..eb43706 100644 --- a/pgsql/template/makefile +++ b/pgsql/template/makefile @@ -94,7 +94,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/pgsql/truncation/makefile b/pgsql/truncation/makefile index f6dfe18..d581f1f 100644 --- a/pgsql/truncation/makefile +++ b/pgsql/truncation/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/pgsql/types/makefile b/pgsql/types/makefile index e2cff01..a144a80 100644 --- a/pgsql/types/makefile +++ b/pgsql/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) diff --git a/qt/common/containers/makefile b/qt/common/containers/makefile index fa74ed4..439bc42 100644 --- a/qt/common/containers/makefile +++ b/qt/common/containers/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/qt/common/smart-ptr/makefile b/qt/common/smart-ptr/makefile index 59ed66e..0a35eae 100644 --- a/qt/common/smart-ptr/makefile +++ b/qt/common/smart-ptr/makefile @@ -108,7 +108,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/common/template/makefile b/qt/common/template/makefile index 808c459..68ca16b 100644 --- a/qt/common/template/makefile +++ b/qt/common/template/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/qt/mssql/basic/makefile b/qt/mssql/basic/makefile index 34a326b..ba1443d 100644 --- a/qt/mssql/basic/makefile +++ b/qt/mssql/basic/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/qt/mssql/date-time/makefile b/qt/mssql/date-time/makefile index d6d7e62..9ca111d 100644 --- a/qt/mssql/date-time/makefile +++ b/qt/mssql/date-time/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/qt/mssql/template/makefile b/qt/mssql/template/makefile index 3fe0eb4..0bd81e3 100644 --- a/qt/mssql/template/makefile +++ b/qt/mssql/template/makefile @@ -99,7 +99,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/mysql/basic/makefile b/qt/mysql/basic/makefile index 45a61ac..eaea174 100644 --- a/qt/mysql/basic/makefile +++ b/qt/mysql/basic/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/qt/mysql/date-time/makefile b/qt/mysql/date-time/makefile index 682176b..2d038bd 100644 --- a/qt/mysql/date-time/makefile +++ b/qt/mysql/date-time/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/qt/mysql/template/makefile b/qt/mysql/template/makefile index 918e7d0..9ddaede 100644 --- a/qt/mysql/template/makefile +++ b/qt/mysql/template/makefile @@ -99,7 +99,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/oracle/basic/makefile b/qt/oracle/basic/makefile index fcf137f..f77e896 100644 --- a/qt/oracle/basic/makefile +++ b/qt/oracle/basic/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/qt/oracle/date-time/makefile b/qt/oracle/date-time/makefile index fec548e..51d5374 100644 --- a/qt/oracle/date-time/makefile +++ b/qt/oracle/date-time/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/qt/oracle/template/makefile b/qt/oracle/template/makefile index 01c47bc..c542b36 100644 --- a/qt/oracle/template/makefile +++ b/qt/oracle/template/makefile @@ -99,7 +99,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/pgsql/basic/makefile b/qt/pgsql/basic/makefile index 81c9b4f..576fbd2 100644 --- a/qt/pgsql/basic/makefile +++ b/qt/pgsql/basic/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/qt/pgsql/date-time/makefile b/qt/pgsql/date-time/makefile index 05d9624..c52bb98 100644 --- a/qt/pgsql/date-time/makefile +++ b/qt/pgsql/date-time/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/qt/pgsql/template/makefile b/qt/pgsql/template/makefile index 001996f..aaceb1c 100644 --- a/qt/pgsql/template/makefile +++ b/qt/pgsql/template/makefile @@ -99,7 +99,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/sqlite/basic/makefile b/qt/sqlite/basic/makefile index 6e961bf..2c1b23a 100644 --- a/qt/sqlite/basic/makefile +++ b/qt/sqlite/basic/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/qt/sqlite/date-time/makefile b/qt/sqlite/date-time/makefile index 4ab332e..ebb707e 100644 --- a/qt/sqlite/date-time/makefile +++ b/qt/sqlite/date-time/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/qt/sqlite/template/makefile b/qt/sqlite/template/makefile index 91b96dd..8ce338f 100644 --- a/qt/sqlite/template/makefile +++ b/qt/sqlite/template/makefile @@ -99,7 +99,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/sqlite/template/makefile b/sqlite/template/makefile index a1be429..7f0881d 100644 --- a/sqlite/template/makefile +++ b/sqlite/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/sqlite/truncation/makefile b/sqlite/truncation/makefile index eb0da53..72c47e8 100644 --- a/sqlite/truncation/makefile +++ b/sqlite/truncation/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/sqlite/types/makefile b/sqlite/types/makefile index 4e00e86..bb3c09a 100644 --- a/sqlite/types/makefile +++ b/sqlite/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) -- cgit v1.1