From a7e9b1261b7170c1408e6e19e864bfa56c4ad156 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 11 Sep 2013 11:15:29 +0200 Subject: [PATCH] just use c++0x for now gcc 4.6 and msvc still don't have -std=c++11 --- CMakeLists.txt | 2 +- src/declarativeimports/platformcomponents/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 925354881..f14c16e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ endif() # in the KDE build system, this is the same as CMAKE_BINARY_DIR. configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake COPYONLY) -################# Enable C++11 features for clang and gcc ################# +################# Enable C++0x (still too early for -std=c++11) features for clang and gcc ################# if(UNIX) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x") diff --git a/src/declarativeimports/platformcomponents/CMakeLists.txt b/src/declarativeimports/platformcomponents/CMakeLists.txt index 20139af0d..39c725c75 100644 --- a/src/declarativeimports/platformcomponents/CMakeLists.txt +++ b/src/declarativeimports/platformcomponents/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) include(CheckCXXSourceCompiles) -add_definitions("-std=c++11") +add_definitions("-std=c++0x") set(CMAKE_MODULE_PATH /opt/kf5/usr/kde/share/ECM-0.0.8/find-modules/