From 7312cfc2d0471b5ed8993cb7a94a8da86627a6a3 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 1 Jan 2017 10:31:47 -0800 Subject: [PATCH] CMake: more changes to a simple conditional It seems the CMake versions on Linux and Mac disagree about what might be the correct way to use parenthesis in a mixed AND/OR conditional. This may seem overkill, but it made both CMake versions happy. Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30ed16d90..f67d57168 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,8 +69,10 @@ set(CMAKE_MODULE_PATH # if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ") - if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND - (${CMAKE_SYSTEM_VERSION} MATCHES "11.4." OR ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.7" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.8")) + if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND + ((${CMAKE_SYSTEM_VERSION} MATCHES "11.4.") OR + (${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.7") OR + (${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.8"))) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++") else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")