From dc27c3fb1176fc7fdcfa88a31f0340200916345a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 24 Oct 2012 09:15:18 +0000 Subject: [PATCH] Remove --std=c++11 from my "clang-trunk+gcc STL" platform --- .../CMakeCache.txt | 6 +++--- .../x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/setup | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt index 4941675c641..c95f7d53e8c 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/CMakeCache.txt @@ -45,7 +45,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I //User-defined flags -CGAL_CXX_FLAGS:STRING=--std=c++11 -fno-strict-aliasing -Wall +CGAL_CXX_FLAGS:STRING= -fno-strict-aliasing -Wall //Value Computed by CMake CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/src/Core @@ -176,7 +176,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=/usr/local/packages/llvm-trunk/bin/clang++ //User-defined flags -CMAKE_CXX_FLAGS:STRING=--std=c++11 -fno-strict-aliasing -Wall +CMAKE_CXX_FLAGS:STRING= -fno-strict-aliasing -Wall //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING= @@ -1603,7 +1603,7 @@ CMAKE_UNAME:INTERNAL=/bin/uname CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL=--std=c++11 -fno-strict-aliasing -Wall +CONFIG_CXX_FLAGS:INTERNAL= -fno-strict-aliasing -Wall //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding OpenGL diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/setup b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/setup index 0bf75de12c3..5caab4fdba7 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/setup +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/setup @@ -1,7 +1,6 @@ CC=/usr/local/packages/llvm-trunk/bin/clang CXX=${CC}++ -CXXFLAGS=--std=c++11 -export CXX CC CXXFLAGS +export CXX CC export QTDIR=/usr/lib64/qt-3.3 source /home/lrineau/CGAL/MPFI-RS/setup-rs source /home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/setup-common