Mercurial > hg > svcore

changeset 1054:98d4dabbf740 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
c++11 flag in qmake project
author Chris Cannam
date Wed, 11 Mar 2015 12:20:06 +0000
parents 48e4ffa9fb48
children 0559f25b99f2
files configure configure.ac svcore.pro
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Wed Mar 11 11:52:05 2015 +0000
+++ b/configure	Wed Mar 11 12:20:06 2015 +0000
@@ -4343,7 +4343,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-   	CXXFLAGS_ANY="-std=c++11 -Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+   	CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
         CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
--- a/configure.ac	Wed Mar 11 11:52:05 2015 +0000
+++ b/configure.ac	Wed Mar 11 12:20:06 2015 +0000
@@ -53,7 +53,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-   	CXXFLAGS_ANY="-std=c++11 -Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+   	CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
         CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
--- a/svcore.pro	Wed Mar 11 11:52:05 2015 +0000
+++ b/svcore.pro	Wed Mar 11 12:20:06 2015 +0000
@@ -29,7 +29,7 @@
     }
 }
 
-CONFIG += staticlib qt thread warn_on stl rtti exceptions
+CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11
 QT += network xml
 QT -= gui