From c44008a10d21b89cea992d6d6faee4a18cfb1a70 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 31 Dec 2012 19:05:27 -0800 Subject: [PATCH] Proper detection for G++ and Clang. --- CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c7f791a..aadbdb74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,16 @@ project(Plasma) cmake_minimum_required(VERSION 2.8) +# Detect Clang compiler +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(CMAKE_COMPILER_IS_CLANGXX 1) +endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + +# Require C++11 +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +endif() + # HeadSpin Configuration if(WIN32 AND NOT CYGWIN) add_definitions(-DHS_BUILD_FOR_WIN32) @@ -8,10 +18,6 @@ endif(WIN32 AND NOT CYGWIN) if(UNIX) add_definitions(-DHS_BUILD_FOR_UNIX) endif(UNIX) - -if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - add_definitions(-std=c++0x) -endif() # End HeadSpin Configuration set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")