diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-02 12:29:37 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-02 12:29:37 +0200 |
| commit | 34a371625b17428aa0e35488499a2a7b69b0da27 (patch) | |
| tree | 36bea5761f603245de6e5220f318e532d379dbf5 /qt/common | |
| parent | e67a19c220db8315914a74be7b3527535e480c87 (diff) | |
C++11 support in automake and VC++ projects, portability fixes
Diffstat (limited to 'qt/common')
| -rw-r--r-- | qt/common/template/Makefile.am | 4 | ||||
| -rw-r--r-- | qt/common/template/template-vc10.vcxproj | 2 | ||||
| -rw-r--r-- | qt/common/template/template-vc9.vcproj | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/qt/common/template/Makefile.am b/qt/common/template/Makefile.am index a15f7b8..4101392 100644 --- a/qt/common/template/Makefile.am +++ b/qt/common/template/Makefile.am @@ -24,5 +24,9 @@ ODB = @ODB@ ODBFLAGS = @ODBFLAGS@ ODBCPPFLAGS = @ODBCPPFLAGS@ +if HAVE_CXX11 +ODBFLAGS += --std c++11 +endif + test-odb.hxx: test.hxx $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< diff --git a/qt/common/template/template-vc10.vcxproj b/qt/common/template/template-vc10.vcxproj index 5283a7e..1c4b458 100644 --- a/qt/common/template/template-vc10.vcxproj +++ b/qt/common/template/template-vc10.vcxproj @@ -158,7 +158,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup> <ItemGroup> diff --git a/qt/common/template/template-vc9.vcproj b/qt/common/template/template-vc9.vcproj index 1ad9a61..e8a6a3c 100644 --- a/qt/common/template/template-vc9.vcproj +++ b/qt/common/template/template-vc9.vcproj @@ -348,7 +348,7 @@ __source_entries__(extra_sources) __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx) |