From 71b89f1fc60bf708759291a7c26949d4adcf5cea Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 13 Nov 2016 15:18:46 -0800 Subject: [PATCH] Escape ++ in cmake matches --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e11aa44d..f8dbd892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,7 +299,7 @@ configure_file( ${PROJECT_BINARY_DIR}/system.hh) if((CMAKE_CXX_COMPILER MATCHES "clang") OR - (CMAKE_CXX_COMPILER MATCHES "clang++")) + (CMAKE_CXX_COMPILER MATCHES "clang\\+\\+")) set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf9a3eb4..4523a12b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,7 +139,7 @@ set(LEDGER_INCLUDES if (CMAKE_BUILD_TYPE STREQUAL "Debug") if ((CMAKE_CXX_COMPILER MATCHES "clang") OR - (CMAKE_CXX_COMPILER MATCHES "clang++") OR + (CMAKE_CXX_COMPILER MATCHES "clang\\+\\+") OR (CMAKE_CXX_COMPILER MATCHES "cxx")) add_definitions( # -Weverything