Build: Allow efsw to be built independently of WITH_DYNAMIC_LINKING option (#30019)

2 files changed, 80 insertions, 81 deletions

diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 41bd55fa916..bfc659807b7 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -29,6 +29,9 @@ if(SERVERS)
   add_subdirectory(mysql)
   add_subdirectory(readline)
   add_subdirectory(gsoap)
+endif()
+
+if(SERVERS AND BUILD_EFSW)
   add_subdirectory(efsw)
 endif()
 
diff --git a/dep/efsw/CMakeLists.txt b/dep/efsw/CMakeLists.txt
index 03f6c153115..6b0a11bc127 100644
--- a/dep/efsw/CMakeLists.txt
+++ b/dep/efsw/CMakeLists.txt
@@ -1,90 +1,86 @@
-if (BUILD_SHARED_LIBS)
-  set(SRCS
-    src/efsw/Debug.cpp
-    src/efsw/DirectorySnapshot.cpp
-    src/efsw/DirectorySnapshotDiff.cpp
-    src/efsw/DirWatcherGeneric.cpp
-    src/efsw/FileInfo.cpp
-    src/efsw/FileSystem.cpp
-    src/efsw/FileWatcher.cpp
-    src/efsw/FileWatcherCWrapper.cpp
-    src/efsw/FileWatcherGeneric.cpp
-    src/efsw/FileWatcherImpl.cpp
-    src/efsw/Log.cpp
-    src/efsw/Mutex.cpp
-    src/efsw/String.cpp
-    src/efsw/System.cpp
-    src/efsw/Thread.cpp
-    src/efsw/Watcher.cpp
-    src/efsw/WatcherGeneric.cpp)
+set(SRCS
+  src/efsw/Debug.cpp
+  src/efsw/DirectorySnapshot.cpp
+  src/efsw/DirectorySnapshotDiff.cpp
+  src/efsw/DirWatcherGeneric.cpp
+  src/efsw/FileInfo.cpp
+  src/efsw/FileSystem.cpp
+  src/efsw/FileWatcher.cpp
+  src/efsw/FileWatcherCWrapper.cpp
+  src/efsw/FileWatcherGeneric.cpp
+  src/efsw/FileWatcherImpl.cpp
+  src/efsw/Log.cpp
+  src/efsw/Mutex.cpp
+  src/efsw/String.cpp
+  src/efsw/System.cpp
+  src/efsw/Thread.cpp
+  src/efsw/Watcher.cpp
+  src/efsw/WatcherGeneric.cpp)
 
-  if (WIN32)
-    list (APPEND SRCS
-      src/efsw/platform/win/FileSystemImpl.cpp
-      src/efsw/platform/win/MutexImpl.cpp
-      src/efsw/platform/win/SystemImpl.cpp
-      src/efsw/platform/win/ThreadImpl.cpp)
-  else ()
-    list (APPEND SRCS
-      src/efsw/platform/posix/FileSystemImpl.cpp
-      src/efsw/platform/posix/MutexImpl.cpp
-      src/efsw/platform/posix/SystemImpl.cpp
-      src/efsw/platform/posix/ThreadImpl.cpp)
-  endif()
+if (WIN32)
+  list (APPEND SRCS
+    src/efsw/platform/win/FileSystemImpl.cpp
+    src/efsw/platform/win/MutexImpl.cpp
+    src/efsw/platform/win/SystemImpl.cpp
+    src/efsw/platform/win/ThreadImpl.cpp)
+else ()
+  list (APPEND SRCS
+    src/efsw/platform/posix/FileSystemImpl.cpp
+    src/efsw/platform/posix/MutexImpl.cpp
+    src/efsw/platform/posix/SystemImpl.cpp
+    src/efsw/platform/posix/ThreadImpl.cpp)
+endif()
 
-  if (APPLE)
-    list (APPEND SRCS
-      src/efsw/FileWatcherFSEvents.cpp
-      src/efsw/FileWatcherKqueue.cpp
-      src/efsw/WatcherFSEvents.cpp
-      src/efsw/WatcherKqueue.cpp)
+if (APPLE)
+  list (APPEND SRCS
+    src/efsw/FileWatcherFSEvents.cpp
+    src/efsw/FileWatcherKqueue.cpp
+    src/efsw/WatcherFSEvents.cpp
+    src/efsw/WatcherKqueue.cpp)
 
-    exec_program(uname ARGS -v  OUTPUT_VARIABLE OSX_VERSION)
-    string(REGEX MATCH "[0-9]+" OSX_VERSION ${OSX_VERSION})
-    if (NOT OSX_VERSION GREATER 9)
-      set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_FSEVENTS_NOT_SUPPORTED")
-    endif()
-    set(OPTIONAL_LINK_LIBRARIES "-framework CoreFoundation" "-framework CoreServices")
-  elseif (WIN32)
-    list (APPEND SRCS
-      src/efsw/FileWatcherWin32.cpp
-      src/efsw/WatcherWin32.cpp)
-  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    list (APPEND SRCS
-      src/efsw/FileWatcherInotify.cpp
-      src/efsw/WatcherInotify.cpp)
-    if (NOT EXISTS "/usr/include/sys/inotify.h" AND NOT EXISTS "/usr/local/include/sys/inotify.h")
-      set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_INOTIFY_NOSYS")
-    endif()
-  elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    list (APPEND SRCS
-      src/efsw/FileWatcherKqueue.cpp
-      src/efsw/WatcherKqueue.cpp)
+  exec_program(uname ARGS -v  OUTPUT_VARIABLE OSX_VERSION)
+  string(REGEX MATCH "[0-9]+" OSX_VERSION ${OSX_VERSION})
+  if (NOT OSX_VERSION GREATER 9)
+    set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_FSEVENTS_NOT_SUPPORTED")
   endif()
+  set(OPTIONAL_LINK_LIBRARIES "-framework CoreFoundation" "-framework CoreServices")
+elseif (WIN32)
+  list (APPEND SRCS
+    src/efsw/FileWatcherWin32.cpp
+    src/efsw/WatcherWin32.cpp)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  list (APPEND SRCS
+    src/efsw/FileWatcherInotify.cpp
+    src/efsw/WatcherInotify.cpp)
+  if (NOT EXISTS "/usr/include/sys/inotify.h" AND NOT EXISTS "/usr/local/include/sys/inotify.h")
+    set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_INOTIFY_NOSYS")
+  endif()
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  list (APPEND SRCS
+    src/efsw/FileWatcherKqueue.cpp
+    src/efsw/WatcherKqueue.cpp)
+endif()
 
-  add_library(efsw STATIC ${SRCS})
+add_library(efsw STATIC ${SRCS})
 
-  target_include_directories(efsw
-    PUBLIC
-      ${CMAKE_CURRENT_SOURCE_DIR}/include
-    PRIVATE
-      ${CMAKE_CURRENT_SOURCE_DIR}/src)
+target_include_directories(efsw
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
-  target_compile_definitions(efsw
-    PRIVATE
-      ${OPTIONAL_COMPILE_DEFINITIONS})
+target_compile_definitions(efsw
+  PRIVATE
+    ${OPTIONAL_COMPILE_DEFINITIONS})
 
-  target_link_libraries(efsw
-    PRIVATE
-      trinity-dependency-interface
-    PUBLIC
-      threads
-      ${OPTIONAL_LINK_LIBRARIES})
+target_link_libraries(efsw
+  PRIVATE
+    trinity-dependency-interface
+  PUBLIC
+    threads
+    ${OPTIONAL_LINK_LIBRARIES})
 
-  set_target_properties(efsw
-    PROPERTIES
-      FOLDER
-        "dep")
-else ()
-  add_library(efsw INTERFACE IMPORTED GLOBAL)
-endif ()
+set_target_properties(efsw
+  PROPERTIES
+    FOLDER
+      "dep")