From 57cbddb184c65e445652b542e828200909dd5471 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 20 Jul 2013 10:23:07 +0000 Subject: [PATCH] [CMAKE] - And here's finally a reason why we shouldn't use g++'s host-headers and libraries - Switch back to wishy-washy-what's-a-standard mode for C++ globally, and enable C++11 only for netshell svn path=/trunk/; revision=59534 --- reactos/cmake/gcc.cmake | 2 +- reactos/dll/win32/netshell/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index 12e70e0c858..45156a3e522 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -15,7 +15,7 @@ if(GCC_VERSION VERSION_GREATER 4.7) add_compile_flags("-mstackrealign") endif() -add_compile_flags_language("-fno-rtti -fno-exceptions -std=gnu++11" "CXX") +add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) diff --git a/reactos/dll/win32/netshell/CMakeLists.txt b/reactos/dll/win32/netshell/CMakeLists.txt index 2e0dd3f4916..08019a1ec65 100644 --- a/reactos/dll/win32/netshell/CMakeLists.txt +++ b/reactos/dll/win32/netshell/CMakeLists.txt @@ -1,6 +1,11 @@ set_cpp(WITH_RUNTIME) +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)