updated build system

cmake/hashes.cmake

@@ -9,7 +9,7 @@ set(LIBSODIUM_HASH 8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a5800
 set(FREETYPE2_HASH 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747)
 set(NUSPELL_HASH 5d4baa1daf833a18dc06ae0af0571d9574cc849d47daff6b9ce11dac0a5ded6a)
 set(LIBEVENT_HASH 7180a979aaa7000e1264da484f712d403fcf7679b1e9212c4e3d09f5c93efc24)
-set(CXXOPTS_HASH 9f43fa972532e5df6c5fd5ad0f5bac606cdec541ccaf1732463d8070bbb7f03b)
+set(CXXOPTS_HASH 841f49f2e045b9c6365997c2a8fbf76e6f215042dda4511a5bb04bc5ebc7f88a)
 set(SFML_HASH 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d)
 set(ICU_HASH 925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e)
 set(SECP256K1_HASH 61583939f1f25b92e6401e5b819e399da02562de663873df3056993b40148701)

cmake/libraries/boost.cmake

@@ -46,68 +46,72 @@ if(PROJECT_ENABLE_BOOST)
       ${Boost_LIBRARIES}
     )
   elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    if(PROJECT_CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(BOOST_BUILD_TYPE_LOWER debug)
-    else()
-      set(BOOST_BUILD_TYPE_LOWER release)
+    if (PROJECT_ENABLE_LIBBITCOIN_SYSTEM OR NOT CMAKE_HOST_WIN32)
+      if(PROJECT_CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(BOOST_BUILD_TYPE_LOWER debug)
+      else()
+        set(BOOST_BUILD_TYPE_LOWER release)
+      endif()
+
+      if(PROJECT_IS_ARM64)
+        set(BOOST_ARCH arm)
+      else()
+        set(BOOST_ARCH x86)
+      endif()
+
+      if(PROJECT_STATIC_LINK)
+        set(BOOST_LINK static)
+      else()
+        set(BOOST_LINK "static,shared")
+      endif()
+
+      set(BOOST_BUILD_ARGS
+        --openssldir=$ENV{OPENSSL_ROOT_DIR}
+        --prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
+        address-model=64
+        architecture=${BOOST_ARCH}
+        cxxstd=20
+        cxxstd-dialect=gnu
+        cxxflags=-std=gnu++${CMAKE_CXX_STANDARD}
+        cxxstd=${CMAKE_CXX_STANDARD}
+        define=BOOST_ASIO_HAS_STD_STRING_VIEW
+        define=BOOST_SYSTEM_NO_DEPRECATED
+        link=${BOOST_LINK}
+        linkflags=-std=gnu++${CMAKE_CXX_STANDARD}
+        threading=multi
+        variant=${BOOST_BUILD_TYPE_LOWER}
+      )
+
+      if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
+        set(BOOST_URL_HASH SHA256=${BOOST2_HASH})
+      else()
+        set(BOOST_URL_HASH SHA256=${BOOST_HASH})
+      endif()
+
+      ExternalProject_Add(boost_project
+        PREFIX external
+        URL ${PROJECT_3RD_PARTY_DIR}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}.tar.gz
+        URL_HASH ${BOOST_URL_HASH}
+        BUILD_IN_SOURCE 1
+        LIST_SEPARATOR |
+        CONFIGURE_COMMAND ./bootstrap.sh
+          --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
+        BUILD_COMMAND
+          ./b2
+          -j1
+          ${BOOST_BUILD_ARGS}
+        INSTALL_COMMAND
+          ./b2
+          -j1
+          ${BOOST_BUILD_ARGS}
+          install
+      )
+
+      list(APPEND PROJECT_DEPENDENCIES boost_project)
+
+      if (NOT CMAKE_HOST_WIN32)
+        add_dependencies(boost_project openssl_project)
+      endif()
     endif()
-
-    if(PROJECT_IS_ARM64)
-      set(BOOST_ARCH arm)
-    else()
-      set(BOOST_ARCH x86)
-    endif()
-
-    if(PROJECT_STATIC_LINK)
-      set(BOOST_LINK static)
-    else()
-      set(BOOST_LINK "static,shared")
-    endif()
-
-    set(BOOST_BUILD_ARGS
-      --openssldir=$ENV{OPENSSL_ROOT_DIR}
-      --prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
-      address-model=64
-      architecture=${BOOST_ARCH}
-      cxxstd=20
-      cxxstd-dialect=gnu
-      cxxflags=-std=gnu++${CMAKE_CXX_STANDARD}
-      cxxstd=${CMAKE_CXX_STANDARD}
-      define=BOOST_ASIO_HAS_STD_STRING_VIEW
-      define=BOOST_SYSTEM_NO_DEPRECATED
-      link=${BOOST_LINK}
-      linkflags=-std=gnu++${CMAKE_CXX_STANDARD}
-      threading=multi
-      variant=${BOOST_BUILD_TYPE_LOWER}
-    )
-
-    if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
-      set(BOOST_URL_HASH SHA256=${BOOST2_HASH})
-    else()
-      set(BOOST_URL_HASH SHA256=${BOOST_HASH})
-    endif()
-
-    ExternalProject_Add(boost_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}.tar.gz
-      URL_HASH ${BOOST_URL_HASH}
-      BUILD_IN_SOURCE 1
-      LIST_SEPARATOR |
-      CONFIGURE_COMMAND ./bootstrap.sh
-        --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
-      BUILD_COMMAND
-        ./b2
-        -j1
-        ${BOOST_BUILD_ARGS}
-      INSTALL_COMMAND
-        ./b2
-        -j1
-        ${BOOST_BUILD_ARGS}
-        install
-    )
-
-    list(APPEND PROJECT_DEPENDENCIES boost_project)
-
-    add_dependencies(boost_project openssl_project)
   endif()
 endif()

cmake/libraries/cpp_httplib.cmake

@@ -24,9 +24,9 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
 
     list(APPEND PROJECT_DEPENDENCIES cpphttplib_project)
 
-    add_dependencies(cpphttplib_project 
-      curl_project
-      openssl_project
-    )
+    add_dependencies(cpphttplib_project curl_project)
+    if (NOT CMAKE_HOST_WIN32)
+      add_dependencies(cpphttplib_project openssl_project)
+    endif()
   endif()
 endif()

cmake/libraries/curl.cmake

@@ -42,6 +42,8 @@ if(PROJECT_ENABLE_CURL)
 
     list(APPEND PROJECT_DEPENDENCIES curl_project)
 
-    add_dependencies(curl_project openssl_project)
+    if (NOT CMAKE_HOST_WIN32)
+      add_dependencies(curl_project openssl_project)
+    endif()
   endif()
 endif()

cmake/libraries/libsodium.cmake

@@ -15,7 +15,7 @@ if(PROJECT_ENABLE_LIBSODIUM)
     else()
       link_libraries(${SODIUM_LIBRARIES})
     endif()
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
+  elseif(NOT PROJECT_IS_MINGW)
     if(PROJECT_IS_MINGW)
       set(LIBSODIUM_TYPE mingw64)
     else()

cmake/libraries/openssl.cmake

@@ -12,7 +12,7 @@ if(PROJECT_ENABLE_OPENSSL)
       OpenSSL::Crypto
       OpenSSL::SSL
     )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
+  elseif(NOT PROJECT_IS_MINGW)
     if(PROJECT_IS_MINGW)
       set(OPENSSL_COMPILE_TYPE mingw64)
     elseif(PROJECT_IS_ARM64)

cmake/libraries/sqlite.cmake

@@ -1,15 +1,20 @@
 if(PROJECT_ENABLE_SQLITE)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_SQLITE)
+    if (PROJECT_IS_MINGW AND NOT PROJECT_IS_MINGW_UNIX)
+      pkg_check_modules(SQLITE3 REQUIRED sqlite3>=${SQLITE2_VERSION})
+      include_directories(SYSTEM BEFORE ${SQLITE3_INCLUDE_DIRS})
+      link_libraries(${SQLITE3_LIBRARIES})
+    else()
+      set(SQLITE_SYSTEM_ROOT ${PROJECT_BUILD_DIR}/external/src/sqlite_project)
 
-    set(SQLITE_SYSTEM_ROOT ${PROJECT_BUILD_DIR}/external/src/sqlite_project)
+      include_directories(SYSTEM BEFORE ${SQLITE_SYSTEM_ROOT})
 
-    include_directories(SYSTEM BEFORE ${SQLITE_SYSTEM_ROOT})
-
-    list(APPEND PROJECT_ADDITIONAL_SOURCES
-      ${SQLITE_SYSTEM_ROOT}/sqlite3.c
-    )
-  else()
+      list(APPEND PROJECT_ADDITIONAL_SOURCES
+        ${SQLITE_SYSTEM_ROOT}/sqlite3.c
+      )
+    endif()
+  elseif(NOT PROJECT_IS_MINGW OR PROJECT_IS_MINGW_UNIX)
     ExternalProject_Add(sqlite_project
       PREFIX external
       URL ${PROJECT_3RD_PARTY_DIR}/sqlite-amalgamation-${SQLITE_VERSION}.zip

cmake/libraries/testing.cmake

@@ -1,7 +1,7 @@
 if (PROJECT_ENABLE_TESTING)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_TESTING)
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
+  elseif(NOT PROJECT_IS_MINGW)
     ExternalProject_Add(gtest_project
       PREFIX external
       URL ${PROJECT_3RD_PARTY_DIR}/googletest-${GTEST_VERSION}.tar.gz

cmake/versions.cmake

@@ -12,7 +12,7 @@ set(FREETYPE2_VERSION 2.13.3)
 set(NUSPELL_VERSION 5.1.6)
 set(EXPAT2_VERSION 2_6_2)
 set(LIBEVENT_VERSION 2.1.12)
-set(CXXOPTS_VERSION 3.2.0)
+set(CXXOPTS_VERSION 3.2.1)
 set(SFML_VERSION 2.6.1)
 set(VLC_VERSION 3.0)
 set(ICU_VERSION 75-1)
@@ -32,6 +32,7 @@ set(LIBTASN_VERSION 4.19.0)
 set(ZLIB_VERSION 1.3.1)
 set(PUGIXML_VERSION 1.14)
 set(OPENSSL_VERSION 3.3.1)
+set(SQLITE2_VERSION 3.46.1)
 set(SPDLOG_VERSION 1.14.1)
 set(OPENAL_VERSION 1.23.1)
 set(GTKMM_VERSION 3.0)