Petr Onderka has submitted this change and it was merged. Change subject: GCC 4.6 requires --std=c++0x ......................................................................
GCC 4.6 requires --std=c++0x Change-Id: Ia1396e40a286eb6f2f381f159b78672a811d7948 --- M CMakeLists.txt 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Petr Onderka: Verified; Looks good to me, approved diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ebbb37..eaaaf88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,13 @@ cmake_minimum_required(VERSION 2.8) -if(CMAKE_COMPILER_IS_GNUCXX) +include(CheckCXXCompilerFlag) + +check_cxx_compiler_flag(-std=c++0x LIBCXX_HAS_STDCXX0X_FLAG) +check_cxx_compiler_flag(-std=c++11 LIBCXX_HAS_STDCXX11_FLAG) +if(LIBCXX_HAS_STDCXX11_FLAG) add_definitions(-std=c++11) +elseif(LIBCXX_HAS_STDCXX0X_FLAG) + add_definitions(-std=c++0x) endif() # File list: C/C++ Compiler -- To view, visit https://gerrit.wikimedia.org/r/84123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1396e40a286eb6f2f381f159b78672a811d7948 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps/incremental Gerrit-Branch: gsoc Gerrit-Owner: Petr Onderka <[email protected]> Gerrit-Reviewer: Petr Onderka <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
