fix getdeps build on Windows

Reviewed By: xavierd

Differential Revision: D47744145

fbshipit-source-id: a95266f2178192dedb0ecef6a34eaad458784527

CMakeLists.txt

@@ -14,6 +14,7 @@ endif()
 if (POLICY CMP0057)
   cmake_policy(SET CMP0057 NEW)
 endif()
+cmake_policy(SET CMP0079 NEW)
 
 # Project information
 project("eden" LANGUAGES CXX C)

eden/fs/inodes/sqlitecatalog/CMakeLists.txt

@@ -21,6 +21,7 @@ target_link_libraries(
 
   PRIVATE
     eden_config
+    eden_inodes_inodenumber
     eden_overlay_thrift_cpp
     eden_utils
     Folly::folly
@@ -37,6 +38,7 @@ target_link_libraries(
   PRIVATE
     cpptoml
     eden_sqlite_catalog
+    eden_telemetry
     eden_utils
     Folly::folly
 )

eden/fs/inodes/sqlitecatalog/WindowsFsck.cpp

@@ -412,8 +412,8 @@ std::optional<InodeNumber> fixup(
       XLOGF(
           DBG9,
           "overlayDtype={} vs desiredDtype={}, overlayHash={} vs desiredHash={}",
-          state.overlayDtype,
-          state.desiredDtype,
+          fmt::underlying(state.overlayDtype),
+          fmt::underlying(state.desiredDtype),
           state.overlayHash ? state.overlayHash->toLogString() : "<null>",
           state.desiredHash ? state.desiredHash->toLogString() : "<null>");
       if (state.inOverlay && state.overlayDtype != state.desiredDtype) {

eden/fs/prjfs/PrjfsChannel.cpp

@@ -40,10 +40,10 @@ PPFDEB2 prjFillDirEntryBuffer2_{nullptr};
 
 // TODO: Remove once the build has switched to a more recent SDK
 HRESULT PrjWritePlaceholderInfo2(
-    [in] PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT namespaceVirtualizationContext,
-    [in] PCWSTR destinationFileName,
-    [in] const PRJ_PLACEHOLDER_INFO* placeholderInfo,
-    [in] UINT32 placeholderInfoSize,
+    PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT namespaceVirtualizationContext,
+    PCWSTR destinationFileName,
+    const PRJ_PLACEHOLDER_INFO* placeholderInfo,
+    UINT32 placeholderInfoSize,
     const PRJ_EXTENDED_INFO* ExtendedInfo) {
   return placeholderExtendedInfo2_(
       namespaceVirtualizationContext,
@@ -54,10 +54,10 @@ HRESULT PrjWritePlaceholderInfo2(
 }
 
 HRESULT PrjFillDirEntryBuffer2(
-    [in] PRJ_DIR_ENTRY_BUFFER_HANDLE dirEntryBufferHandle,
-    [in] PCWSTR fileName,
-    [ in, optional ] PRJ_FILE_BASIC_INFO* fileBasicInfo,
-    [ in, optional ] PRJ_EXTENDED_INFO* extendedInfo) {
+    PRJ_DIR_ENTRY_BUFFER_HANDLE dirEntryBufferHandle,
+    PCWSTR fileName,
+    PRJ_FILE_BASIC_INFO* fileBasicInfo,
+    PRJ_EXTENDED_INFO* extendedInfo) {
   return prjFillDirEntryBuffer2_(
       dirEntryBufferHandle, fileName, fileBasicInfo, extendedInfo);
 }

eden/fs/prjfs/PrjfsChannel.h

@@ -60,17 +60,17 @@ typedef struct _PRJ_EXTENDED_INFO {
 } PRJ_EXTENDED_INFO;
 
 typedef HRESULT(WINAPI* PPWPI2)(
-    [in] PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT,
-    [in] PCWSTR,
-    [in] const PRJ_PLACEHOLDER_INFO*,
-    [in] UINT32,
+    PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT,
+    PCWSTR,
+    const PRJ_PLACEHOLDER_INFO*,
+    UINT32,
     const _PRJ_EXTENDED_INFO*);
 
 typedef HRESULT(WINAPI* PPFDEB2)(
-    [in] PRJ_DIR_ENTRY_BUFFER_HANDLE dirEntryBufferHandle,
-    [in] PCWSTR fileName,
-    [ in, optional ] PRJ_FILE_BASIC_INFO* fileBasicInfo,
-    [ in, optional ] PRJ_EXTENDED_INFO* extendedInfo);
+    PRJ_DIR_ENTRY_BUFFER_HANDLE dirEntryBufferHandle,
+    PCWSTR fileName,
+    PRJ_FILE_BASIC_INFO* fileBasicInfo,
+    PRJ_EXTENDED_INFO* extendedInfo);
 
 struct PrjfsTraceEvent : TraceEventBase {
   enum Type : unsigned char {

eden/fs/service/CMakeLists.txt

@@ -69,6 +69,7 @@ target_link_libraries(
     eden_model
     eden_nfs_server
     eden_store
+    eden_takeover
     eden_telemetry
     ${EDEN_STORE_IMPLEMENTATIONS}
     ${YARPL_LIBRARIES}
@@ -83,7 +84,6 @@ if (NOT WIN32)
     PUBLIC
       eden_fuse
       eden_notifications
-      eden_takeover
   )
 endif()
 

eden/fs/service/EdenServiceHandler.cpp

@@ -1231,7 +1231,8 @@ apache::thrift::ServerStream<FsEvent> EdenServiceHandler::traceFsEvents(
     context->argHandle = prjfsChannel->traceDetailedArguments();
   } else {
     EDEN_BUG() << "tracing isn't supported yet for the "
-               << edenMount.getCheckoutConfig()->getMountProtocol()
+               << fmt::underlying(
+                      edenMount.getCheckoutConfig()->getMountProtocol())
                << " filesystem type";
   }
 #else

eden/fs/store/CMakeLists.txt

@@ -23,6 +23,7 @@ target_link_libraries(
     eden_service_thrift_cpp
     eden_sqlite
     eden_store_filter
+    eden_telemetry
     eden_utils
     fb303::fb303
     edencommon::edencommon_utils

eden/fs/takeover/CMakeLists.txt

@@ -8,17 +8,23 @@ add_fbthrift_cpp_library(
   takeover.thrift
 )
 
+file(GLOB TAKEOVER_SRCS "*.cpp")
+add_library(
+  eden_takeover STATIC
+  ${TAKEOVER_SRCS}
+)
+target_link_libraries(
+  eden_takeover
+  PUBLIC
+  eden_config
+  eden_utils
+  eden_takeover_thrift
+)
+
 if (NOT WIN32)
-  file(GLOB TAKEOVER_SRCS "*.cpp")
-  add_library(
-    eden_takeover STATIC
-      ${TAKEOVER_SRCS}
-  )
   target_link_libraries(
-    eden_takeover
+    eden_service
     PUBLIC
       eden_fuse
-      eden_utils
-      eden_takeover_thrift
   )
 endif()