From 629725e262323ea811d3b23d8bd92bf44dc7335f Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 30 Nov 2023 10:40:29 -0600
Subject: [PATCH] build fixes

---
 .cspell/words.txt   |  1 +
 CMakeLists.txt      |  7 +++----
 cmake/boost.cmake   |  6 +++---
 cmake/curl.cmake    | 16 ++++++++++++----
 cmake/rocksdb.cmake |  1 +
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.cspell/words.txt b/.cspell/words.txt
index 45eb8f90..647f129d 100644
--- a/.cspell/words.txt
+++ b/.cspell/words.txt
@@ -70,6 +70,7 @@ duse_libidn2
 dwith_gflags
 dwith_liburing
 dwith_tools
+dxxh_no_inline_hints
 dylib
 endfunction
 endmacro
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1054fa6..0c92f621 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,12 +83,12 @@ if (LINUX OR MINGW)
   if (LIBFUSE3 AND NOT MINGW)
     pkg_check_modules(LIBFUSE3 REQUIRED fuse3>=3.0.0)
     set(LIBFUSE3_LIBRARIES ${LIBFUSE3})
-    add_definitions(-DFUSE_USE_VERSION=30)
+    set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=30)
   endif()
 
   if(NOT LIBFUSE3_LIBRARIES AND NOT MINGW)
     pkg_check_modules(LIBFUSE2 REQUIRED fuse>=2.9.0)
-    add_definitions(-DFUSE_USE_VERSION=29)
+    set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=29)
   endif()
 
   if (NOT LIBPTHREAD_LIBRARY) 
@@ -132,8 +132,7 @@ elseif (MACOS)
     message(FATAL_ERROR "'libpthread' not found")
   endif()
 
-  set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DBOOST_ASIO_HAS_STD_STRING_VIEW)
-  add_definitions(-DFUSE_USE_VERSION=29)
+  set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=29 -DBOOST_ASIO_HAS_STD_STRING_VIEW)
 
   include_directories(/usr/local/include)
   find_library(OSXFUSE NO_CACHE NAMES OSXFUSE)
diff --git a/cmake/boost.cmake b/cmake/boost.cmake
index c92633bc..60918ef3 100644
--- a/cmake/boost.cmake
+++ b/cmake/boost.cmake
@@ -39,7 +39,7 @@ set (BOOST_COMMON_ARGS
 )
 
 if (MINGW)
-  if (NOT WIN32)
+  if (NOT CMAKE_HOST_WIN32)
     set(BOOST_COMMON_ARGS 
       ${BOOST_COMMON_ARGS}
       --user-config=./user-config.jam
@@ -77,7 +77,7 @@ if (MINGW)
   set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION})
   string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_VERSION})
   list(GET BOOST_GCC_VERSION_LIST 0 BOOST_GCC_MAJOR_VERSION)
-  if(WIN32)
+  if (CMAKE_HOST_WIN32)
     set(BOOST_LIB_EXTRA "-mgw${BOOST_GCC_MAJOR_VERSION}-mt${DEBUG_EXTRA2}-x64-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}")
   endif()
 endif()
@@ -95,6 +95,6 @@ set(Boost_LIBRARIES
 )
 
 add_dependencies(boost_project zlib_project)
-if (WIN32)
+if (CMAKE_HOST_WIN32)
   include_directories(SYSTEM ${EXTERNAL_BUILD_ROOT}/include/boost-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
 endif()
diff --git a/cmake/curl.cmake b/cmake/curl.cmake
index 329a77cf..0d47189d 100644
--- a/cmake/curl.cmake
+++ b/cmake/curl.cmake
@@ -38,10 +38,18 @@ if (CMAKE_TOOLCHAIN_FILE)
   )
 endif()
 
-set(CURL_CMAKE_ARGS
-  ${CURL_CMAKE_ARGS}
-  -DCURL_USE_OPENSSL=ON
-)
+if (MINGW)
+  set(CURL_CMAKE_ARGS
+    ${CURL_CMAKE_ARGS}
+    -DCURL_USE_OPENSSL=OFF
+    -DUSE_WIN32_CRYPTO=ON
+  )
+else()
+  set(CURL_CMAKE_ARGS
+    ${CURL_CMAKE_ARGS}
+    -DCURL_USE_OPENSSL=ON
+  )
+endif()
 
 ExternalProject_Add(curl_project
   DOWNLOAD_NO_PROGRESS 1
diff --git a/cmake/rocksdb.cmake b/cmake/rocksdb.cmake
index bb9af1aa..bfa861a5 100644
--- a/cmake/rocksdb.cmake
+++ b/cmake/rocksdb.cmake
@@ -8,6 +8,7 @@ endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(ROCKSDB_CMAKE_CXX_FLAGS "${ROCKSDB_CMAKE_CXX_FLAGS} -DXXH_NO_INLINE_HINTS")
+  set(REPERTORY_DEFINITIONS "${REPERTORY_DEFINITIONS} -DXXH_NO_INLINE_HINTS")
 endif()
 
 set(ROCKSDB_CMAKE_ARGS