hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Instead of modifying include paths, include osxfuse header from the right location

Browse Source
This commit is contained in:
Sebastian Messmer 2016-02-17 22:30:28 +01:00
parent 980f560f04
commit 014b5703e0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fspp/CMakeLists.txt
View File

@ -18,8 +18,6 @@ target_activate_cpp14(${PROJECT_NAME})
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_FIND_FRAMEWORK LAST) set(CMAKE_FIND_FRAMEWORK LAST)
set(FUSE_LIB_NAME "osxfuse") 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") else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(FUSE_LIB_NAME "fuse") set(FUSE_LIB_NAME "fuse")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

6
src/fspp/fuse/params.h
View File

@ -3,6 +3,12 @@
#define MESSMER_FSPP_FUSE_PARAMS_H_ #define MESSMER_FSPP_FUSE_PARAMS_H_
#define FUSE_USE_VERSION 26 #define FUSE_USE_VERSION 26
#ifdef __linux__
#include <fuse.h> #include <fuse.h>
#elif __APPLE__
#include <osxfuse/fuse.h>
#else
#error System not supported
#endif
#endif #endif