From 09c15173f9ea4666072ec996039c426c84a22e43 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sat, 28 Feb 2015 10:55:01 +0000 Subject: [PATCH] Simplify -std=c++0x flag logic This could be improved in CMake 3.1 by using CXX_STANDARD and CXX_STANDARD_REQUIRED (see http://stackoverflow.com/a/20165220/96704) --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3e6c800..785531d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,9 @@ MARK_AS_ADVANCED(FORCE POLYVOX_VERSION) SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) include(FeatureSummary) -IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW" +IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") #Maybe "OR MINGW" ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode ENDIF() -if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode -endif() ADD_SUBDIRECTORY(include)