aboutsummaryrefslogtreecommitdiff
path: root/qt
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 /qt
parent50b4de07844ca2a5781d7845115d7bd9e7c8f003 (diff)
C++11 support (pass --std ODB compiler option in build makefiles)
Diffstat (limited to 'qt')
-rw-r--r--qt/common/containers/makefile5
-rw-r--r--qt/common/smart-ptr/makefile5
-rw-r--r--qt/common/template/makefile5
-rw-r--r--qt/mssql/basic/makefile5
-rw-r--r--qt/mssql/date-time/makefile5
-rw-r--r--qt/mssql/template/makefile5
-rw-r--r--qt/mysql/basic/makefile5
-rw-r--r--qt/mysql/date-time/makefile5
-rw-r--r--qt/mysql/template/makefile5
-rw-r--r--qt/oracle/basic/makefile5
-rw-r--r--qt/oracle/date-time/makefile5
-rw-r--r--qt/oracle/template/makefile5
-rw-r--r--qt/pgsql/basic/makefile5
-rw-r--r--qt/pgsql/date-time/makefile5
-rw-r--r--qt/pgsql/template/makefile5
-rw-r--r--qt/sqlite/basic/makefile5
-rw-r--r--qt/sqlite/date-time/makefile5
-rw-r--r--qt/sqlite/template/makefile5
18 files changed, 90 insertions, 0 deletions
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)