From b4194657cab52fc196f565f5b9cb28e60a88b5c5 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Tue, 2 Mar 2010 21:51:40 +0000 Subject: [PATCH] Make C++0x mode the default. The option still remains to disable it. --- CMakeLists.txt | 2 +- INSTALL.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce1dee5d..e11f0c25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(POLYVOX_VERSION_MINOR "1") SET(POLYVOX_VERSION_PATCH "0") SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}") -OPTION(ENABLE_CPP0X "Does the compiler support C++0x" OFF) #Enable with -DENABLE_CPP0X=ON or in the GUI +OPTION(ENABLE_CPP0X "Does the compiler support C++0x" ON) #Disable with -DENABLE_CPP0X=OFF or in the GUI IF(ENABLE_CPP0X) IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW" ADD_DEFINITIONS(-DC_PLUS_PLUS_ZERO_X_SUPPORTED -std=c++0x) #Will only work on GCC diff --git a/INSTALL.txt b/INSTALL.txt index f144764f..9beeb0c5 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -27,7 +27,7 @@ You can set CMake variables by passing -D:= cmake command The other available settings for PolyVox are: ``ENABLE_CPP0X`` (ON or OFF) - Build PolyVox using your compilers built-in versions of the C++0x features. Defaults to OFF which uses the bundled Boost versions + Build PolyVox using your compilers built-in versions of the C++0x features. Setting it to OFF will use the bundled Boost versions. Defaults to ON. ``ENABLE_EXAMPLES`` (ON or OFF) Build the example applications that come with PolyVox. Defaults to ON.