update

cmake/flags.cmake

@@ -48,6 +48,10 @@ list(APPEND PROJECT_CXXFLAGS_LIST
   -Wunused
 )
 
+if (PROJECT_ENABLE_LIBBITCOIN_SYSTEM AND PROJECT_IS_DARWIN)
+  list(APPEND PROJECT_CXXFLAGS_LIST -Wno-enum-constexpr-conversion)
+endif()
+
 if (NOT PROJECT_IS_DARWIN)
   list(APPEND PROJECT_CXXFLAGS_LIST 
     -Wduplicated-branches

cmake/libraries/boost.cmake

@@ -95,9 +95,17 @@ if(PROJECT_ENABLE_BOOST)
       endif()
 
       if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
+<<<<<<< HEAD
         set(BOOST_CXX_STANDARD 20)
       else()
         set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
+=======
+        set(BOOST_CXX_STANDARD 14)
+        set(BOOST_OPTIONS cxxflags=-Wno-enum-constexpr-conversion)
+      else()
+        set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
+        set(BOOST_OPTIONS define=BOOST_ASIO_HAS_STD_STRING_VIEW)
+>>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3
       endif()
 
       set(BOOST_BUILD_ARGS
@@ -106,14 +114,21 @@ if(PROJECT_ENABLE_BOOST)
         address-model=64
         architecture=${BOOST_ARCH}
         cxxstd-dialect=gnu
+<<<<<<< HEAD
         cxxflags=-std=gnu++${BOOST_CXX_STANDARD}
         cxxstd=${BOOST_CXX_STANDARD}
         define=BOOST_ASIO_HAS_STD_STRING_VIEW
         define=BOOST_SYSTEM_NO_DEPRECATED
         link=${BOOST_LINK}
         linkflags=-std=gnu++${BOOST_CXX_STANDARD}
+=======
+        cxxstd=${BOOST_CXX_STANDARD}
+        define=BOOST_SYSTEM_NO_DEPRECATED
+        link=${BOOST_LINK}
+>>>>>>> 70cc850f10c2fcd1733ae05dce5c4503db3a11f3
         threading=multi
         variant=${BOOST_BUILD_TYPE_LOWER}
+        ${BOOST_OPTIONS}
       )
 
       ExternalProject_Add(boost_project

cmake/libraries/fuse.cmake

@@ -21,7 +21,7 @@ if(PROJECT_ENABLE_FUSE AND NOT PROJECT_IS_MINGW)
     endif()
   else()
     if (PROJECT_IS_DARWIN)
-      find_library(OSXFUSE NO_CACHE NAMES OSXFUSE)
+      find_library(OSXFUSE NO_CACHE NAMES MACFUSE OSXFUSE)
       if (NOT OSXFUSE)
         message(FATAL_ERROR "FUSE for macOS not found (https://macfuse.github.io)")
       endif ()