[PATCH 10/12] fsmonitor: enable fsmonitor for Linux
From: Eric DeCosta <edecosta@mathworks.com>
Uodate build to enable fsmonitor for Linux.
Signed-off-by: Eric DeCosta <edecosta@mathworks.com>
---
config.mak.uname | 9 +++++++++
contrib/buildsystems/CMakeLists.txt | 11 ++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index d454cec47c4..04988266835 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -69,6 +69,15 @@ ifeq ($(uname_S),Linux)
BASIC_CFLAGS += -std=c99
endif
+ # The builtin FSMonitor on Linux builds upon Simple-IPC. Both require
+ # Unix domain sockets and PThreads.
+ ifndef NO_PTHREADS
+ ifndef NO_UNIX_SOCKETS
+ FSMONITOR_DAEMON_BACKEND = linux
+ FSMONITOR_OS_SETTINGS = linux
+ FSMONITOR_DAEMON_COMMON = unix
+ endif
+ endif
endif
ifeq ($(uname_S),GNU/kFreeBSD)
HAVE_ALLOCA_H = YesPlease
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 0b26a1a36e3..afabfcdefdd 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -304,7 +304,16 @@ else()
endif()
if(SUPPORTS_SIMPLE_IPC)
- if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-ipc-unix.c)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-health-unix.c)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-linux.c)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-path-utils-linux.c)
+
+ add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
+ list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-unix.c)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_compile_definitions(HAVE_FSMONITOR_DAEMON_BACKEND)
list(APPEND compat_SOURCES compat/fsmonitor/fsm-listen-win32.c)
list(APPEND compat_SOURCES compat/fsmonitor/fsm-health-win32.c)
--
gitgitgadget
Eric DeCosta via GitGitGadget <gitgitgadget@gmail.com>