diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-02-24 10:03:19 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-02-24 10:03:19 +0200 |
| commit | 564700ab7c96b671b0c08a37e9a0e50f4b2fc176 (patch) | |
| tree | dd698330f5b455597998e84972b96a7d15b5a53d /qt/common | |
| parent | 50b4de07844ca2a5781d7845115d7bd9e7c8f003 (diff) | |
C++11 support (pass --std ODB compiler option in build makefiles)
Diffstat (limited to 'qt/common')
| -rw-r--r-- | qt/common/containers/makefile | 5 | ||||
| -rw-r--r-- | qt/common/smart-ptr/makefile | 5 | ||||
| -rw-r--r-- | qt/common/template/makefile | 5 |
3 files changed, 15 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) |