fsmonitor-settings: stub in platform-specific incompatibility checkin…

…g on MacOS Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
jeffhostetler · Aug 16, 2021 · 7b8c024 · 7b8c024
1 parent e3fc6ef
commit 7b8c024
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/compat/fsmonitor/fsm-settings-darwin.c b/compat/fsmonitor/fsm-settings-darwin.c
@@ -0,0 +1,9 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+#include "fsmonitor-settings.h"
+
+enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
+{
+	return FSMONITOR_REASON_ZERO;
+}
diff --git a/config.mak.uname b/config.mak.uname
@@ -148,6 +148,7 @@ ifeq ($(uname_S),Darwin)
 		endif
 	endif
 	FSMONITOR_DAEMON_BACKEND = darwin
+	FSMONITOR_OS_SETTINGS = darwin
 	BASIC_LDFLAGS += -framework CoreServices
 endif
 ifeq ($(uname_S),SunOS)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
@@ -296,6 +296,9 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
 	list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-win32.c)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	add_compile_definitions(HAVE_FSMONITOR_OS_SETTINGS)
+	list(APPEND compat_SOURCES compat/fsmonitor/fsm-settings-darwin.c)
 endif()
 
 set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX})