From 014b5703e040cdbd58891d417010d9d5cb6cca5a Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Wed, 17 Feb 2016 22:30:28 +0100 Subject: [PATCH] Instead of modifying include paths, include osxfuse header from the right location --- src/fspp/CMakeLists.txt | 2 -- src/fspp/fuse/params.h | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/fspp/CMakeLists.txt b/src/fspp/CMakeLists.txt index 8a6575c3..45a25865 100644 --- a/src/fspp/CMakeLists.txt +++ b/src/fspp/CMakeLists.txt @@ -18,8 +18,6 @@ target_activate_cpp14(${PROJECT_NAME}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_FIND_FRAMEWORK LAST) set(FUSE_LIB_NAME "osxfuse") - # Add a default location for homebrew-installed openssl on Mac OS X to include search path - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC /usr/local/include/osxfuse) else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(FUSE_LIB_NAME "fuse") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/src/fspp/fuse/params.h b/src/fspp/fuse/params.h index 9903ac82..7a078d32 100644 --- a/src/fspp/fuse/params.h +++ b/src/fspp/fuse/params.h @@ -3,6 +3,12 @@ #define MESSMER_FSPP_FUSE_PARAMS_H_ #define FUSE_USE_VERSION 26 +#ifdef __linux__ #include +#elif __APPLE__ +#include +#else +#error System not supported +#endif #endif