aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@mit.edu>2016-02-13 15:24:52 -0500
committerGravatar Benjamin Barenblat <bbaren@mit.edu>2016-02-13 15:24:52 -0500
commit34eb0db1e04cbfc0504c239a151247334f1bb0a8 (patch)
treeca141ef419acd031ec713659caf735266543f84d
parentd9370d044e237df9df9336adad836956d42d7c85 (diff)
Make FUSE and glog be system includes
Prevent obnoxious error messages by making FUSE and glog be included with -isystem instead of -I.
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/operations.cc6
-rw-r--r--src/operations.h5
4 files changed, 3 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a664713..8121a56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,5 +29,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrapv")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong --param=ssp-buffer-size=4")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-macros")
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f1b286..f2f0c0f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,8 +38,8 @@ add_executable(
)
target_include_directories(
scoville
- PRIVATE ${FUSE_INCLUDE_DIRS}
- PRIVATE ${GLOG_INCLUDE_DIRS}
+ SYSTEM PRIVATE ${FUSE_INCLUDE_DIRS}
+ SYSTEM PRIVATE ${GLOG_INCLUDE_DIRS}
)
target_link_libraries(
scoville
diff --git a/src/operations.cc b/src/operations.cc
index a26b868..17ce2a3 100644
--- a/src/operations.cc
+++ b/src/operations.cc
@@ -19,14 +19,8 @@
#include <cerrno>
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#pragma clang diagnostic ignored "-Wdocumentation"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wunused-macros"
#define FUSE_USE_VERSION 26
#include <fuse.h>
-#pragma clang diagnostic pop
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/src/operations.h b/src/operations.h
index e4672eb..a623fef 100644
--- a/src/operations.h
+++ b/src/operations.h
@@ -15,13 +15,8 @@
#ifndef OPERATIONS_H_
#define OPERATIONS_H_
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#pragma clang diagnostic ignored "-Wdocumentation"
-#pragma clang diagnostic ignored "-Wpadded"
#define FUSE_USE_VERSION 26
#include <fuse.h>
-#pragma clang diagnostic pop
namespace scoville {