diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-11-13 15:16:32 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-11-13 15:16:32 -0800 |
| commit | 121687a0265d4e874300de0d00d03834a9e20bcd (patch) | |
| tree | 0bfc8e920f41117103627822d24bb5670be1de1a | |
| parent | 1107f489fadb1ad34f0c01c6b6a1e47306557b54 (diff) | |
| download | fork-ledger-121687a0265d4e874300de0d00d03834a9e20bcd.tar.gz fork-ledger-121687a0265d4e874300de0d00d03834a9e20bcd.tar.bz2 fork-ledger-121687a0265d4e874300de0d00d03834a9e20bcd.zip | |
Don't use -isystem with g++ anymore
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f5da6a04..e11aa44d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,9 +298,8 @@ configure_file( ${PROJECT_SOURCE_DIR}/src/system.hh.in ${PROJECT_BINARY_DIR}/system.hh) -if (CMAKE_CXX_COMPILER MATCHES "clang") - set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") -elseif(CMAKE_CXX_COMPILER MATCHES "g\\+\\+") +if((CMAKE_CXX_COMPILER MATCHES "clang") OR + (CMAKE_CXX_COMPILER MATCHES "clang++")) set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 46e1f8e4..cf9a3eb4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -242,7 +242,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") get_directory_property(DIRINC INCLUDE_DIRECTORIES) foreach(_inc ${DIRINC}) - list(APPEND _args "-isystem " ${_inc}) + list(APPEND _args "-I" ${_inc}) endforeach(_inc ${DIRINC}) separate_arguments(_args) |