Make sure we use C++ 11

It's rare we use a compiler that has anything older as a default, but it
does happen sometimes. So make sure to guarantee this so we can start
using more modern constructs.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba6b3203675d706e9e26dcb0f1f4c193fd59e1dd..b9482b1bfc53f4d286766709a5a8375480f881d5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,8 +69,9 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug)
   add_definitions(-D_DEBUG)
 ENDIF()
 
-# Make sure we get a sane C version
+# Make sure we get a sane C and C++ version
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
 
 # Tell the compiler to be stringent
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wvla")

diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index f9ed19d949d3b4cb3b1a0b9897bc95bdf3fe58dc..402e37dbcf1168db5a8794afdc5feb8900c7529a 100644 (file)
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -14,6 +14,8 @@ AM_CPPFLAGS = \
        -I$(TIGERVNC_SRCDIR)/unix/common \
        $(DIX_CFLAGS)
 
+AM_CXXFLAGS = -std=gnu++11
+
 noinst_LTLIBRARIES = libvnccommon.la
 
 HDRS = vncExtInit.h vncHooks.h \