aboutsummaryrefslogtreecommitdiff
path: root/qt/oracle
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-03-02 12:29:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-03-02 12:29:37 +0200
commit34a371625b17428aa0e35488499a2a7b69b0da27 (patch)
tree36bea5761f603245de6e5220f318e532d379dbf5 /qt/oracle
parente67a19c220db8315914a74be7b3527535e480c87 (diff)
C++11 support in automake and VC++ projects, portability fixes
Diffstat (limited to 'qt/oracle')
-rw-r--r--qt/oracle/template/Makefile.am4
-rw-r--r--qt/oracle/template/template-vc10.vcxproj2
-rw-r--r--qt/oracle/template/template-vc9.vcproj2
3 files changed, 6 insertions, 2 deletions
diff --git a/qt/oracle/template/Makefile.am b/qt/oracle/template/Makefile.am
index 5d19be3..6e23f58 100644
--- a/qt/oracle/template/Makefile.am
+++ b/qt/oracle/template/Makefile.am
@@ -26,6 +26,10 @@ 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/oracle/template/template-vc10.vcxproj b/qt/oracle/template/template-vc10.vcxproj
index d984502..0ea856a 100644
--- a/qt/oracle/template/template-vc10.vcxproj
+++ b/qt/oracle/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
__custom_build_entry__(
test.hxx,
odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -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/oracle/template/template-vc9.vcproj b/qt/oracle/template/template-vc9.vcproj
index 563a440..a350894 100644
--- a/qt/oracle/template/template-vc9.vcproj
+++ b/qt/oracle/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
__file_entry_custom_build__(
test.hxx,
odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -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))