macos build fixes

2025-08-07 18:34:26 -05:00
parent 7bfb4a9518
commit e8f0b3d8dc
17 changed files with 11 additions and 71 deletions
--- a/cmake/functions.cmake
+++ b/cmake/functions.cmake
@@ -36,7 +36,6 @@ function(add_project_executable2 name dependencies libraries headers sources is_
  endif()

  if (PROJECT_IS_DARWIN AND PROJECT_MACOS_ICNS_SOURCE AND "${name}" STREQUAL "${PROJECT_NAME}")
-    set(PROJECT_MACOS_ICNS_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACOS_ICNS_NAME}")
    set_source_files_properties(${PROJECT_MACOS_ICNS_SOURCE} PROPERTIES
      MACOSX_PACKAGE_LOCATION "Resources"
    )
--- a/cmake/libraries.cmake
+++ b/cmake/libraries.cmake
@@ -7,8 +7,6 @@ set(SFML_STATIC_LIBRARIES ${PROJECT_STATIC_LINK})
 set(ZLIB_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
 set(wxWidgets_USE_STATIC ${PROJECT_STATIC_LINK})

-include(cmake/libraries/zlib.cmake)
-
 include(cmake/libraries/openssl.cmake)

 include(cmake/libraries/boost.cmake)
--- a/cmake/libraries/boost.cmake
+++ b/cmake/libraries/boost.cmake
@@ -128,10 +128,12 @@ if(PROJECT_ENABLE_BOOST)
          --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
        BUILD_COMMAND
          ./b2
+          -sNO_BZIP2=1
          -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
          ${BOOST_BUILD_ARGS}
        INSTALL_COMMAND
          ./b2
+          -sNO_BZIP2=1
          -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
          ${BOOST_BUILD_ARGS}
          install
@@ -142,9 +144,6 @@ if(PROJECT_ENABLE_BOOST)
      if (NOT CMAKE_HOST_WIN32)
        add_dependencies(boost_project openssl_project)
      endif()
-      if (PROJECT_IS_DARWIN)
-        add_dependencies(boost_project zlib_project)
-      endif()
    endif()
  endif()
 endif()
--- a/cmake/libraries/cpp_httplib.cmake
+++ b/cmake/libraries/cpp_httplib.cmake
@@ -32,8 +32,5 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
    if (NOT CMAKE_HOST_WIN32)
      add_dependencies(cpphttplib_project openssl_project)
    endif()
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(cpphttplib_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/curl.cmake
+++ b/cmake/libraries/curl.cmake
@@ -52,9 +52,5 @@ if(PROJECT_ENABLE_CURL)
    if (NOT CMAKE_HOST_WIN32)
      add_dependencies(curl_project openssl_project)
    endif()
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(curl_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/json.cmake
+++ b/cmake/libraries/json.cmake
@@ -25,9 +25,5 @@ if(PROJECT_ENABLE_JSON)
    )

    list(APPEND PROJECT_DEPENDENCIES json_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(json_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/libsodium.cmake
+++ b/cmake/libraries/libsodium.cmake
@@ -44,9 +44,5 @@ if(PROJECT_ENABLE_LIBSODIUM)
    )

    list(APPEND PROJECT_DEPENDENCIES libsodium_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(libsodium_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/openssl.cmake
+++ b/cmake/libraries/openssl.cmake
@@ -55,8 +55,5 @@ if(PROJECT_ENABLE_OPENSSL)
    )

    list(APPEND PROJECT_DEPENDENCIES openssl_project)
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(openssl_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/pugixml.cmake
+++ b/cmake/libraries/pugixml.cmake
@@ -24,9 +24,5 @@ if(PROJECT_ENABLE_PUGIXML)
    )

    list(APPEND PROJECT_DEPENDENCIES pugixml_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(pugixml_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/rocksdb.cmake
+++ b/cmake/libraries/rocksdb.cmake
@@ -21,6 +21,7 @@ if(PROJECT_ENABLE_ROCKSDB)
        -DROCKSDB_INSTALL_ON_WINDOWS=ON
        -DWITH_BENCHMARK=OFF
        -DWITH_BENCHMARK_TOOLS=OFF
+        -DWITH_BZ2=OFF
        -DWITH_CORE_TOOLS=OFF
        -DWITH_EXAMPLES=OFF
        -DWITH_GFLAGS=OFF
@@ -33,9 +34,5 @@ if(PROJECT_ENABLE_ROCKSDB)
    )

    list(APPEND PROJECT_DEPENDENCIES rocksdb_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(rocksdb_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/spdlog.cmake
+++ b/cmake/libraries/spdlog.cmake
@@ -22,9 +22,5 @@ if(PROJECT_ENABLE_SPDLOG)
    )

    list(APPEND PROJECT_DEPENDENCIES spdlog_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(spdlog_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/sqlite.cmake
+++ b/cmake/libraries/sqlite.cmake
@@ -25,9 +25,5 @@ if(PROJECT_ENABLE_SQLITE)
    )

    list(APPEND PROJECT_DEPENDENCIES sqlite_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(sqlite_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/stduuid.cmake
+++ b/cmake/libraries/stduuid.cmake
@@ -23,9 +23,5 @@ if(PROJECT_ENABLE_STDUUID)
    )

    list(APPEND PROJECT_DEPENDENCIES stduuid_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(stduuid_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/testing.cmake
+++ b/cmake/libraries/testing.cmake
@@ -14,9 +14,5 @@ if (PROJECT_ENABLE_TESTING)
    )

    list(APPEND PROJECT_DEPENDENCIES gtest_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(gtest_project zlib_project)
-    endif()
  endif()
 endif()
--- a/cmake/libraries/zlib.cmake
+++ b/cmake/libraries/zlib.cmake
@@ -1,16 +0,0 @@
-if(PROJECT_IS_DARWIN)
-  if(NOT PROJECT_BUILD)
-    ExternalProject_Add(zlib_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/mingw64/zlib-${ZLIB_VERSION}.tar.gz
-      URL_HASH SHA256=${ZLIB_HASH}
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-    )
-
-    list(APPEND PROJECT_DEPENDENCIES zlib_project)
-  endif()
-endif()
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,15 +1,15 @@
 set(BINUTILS_VERSION 2.44)
-set(BOOST2_MAJOR_VERSION 1)
-set(BOOST2_MINOR_VERSION 76)
-set(BOOST2_PATCH_VERSION 0)
 set(BOOST_MAJOR_VERSION 1)
 set(BOOST_MINOR_VERSION 88)
 set(BOOST_PATCH_VERSION 0)
+set(BOOST2_MAJOR_VERSION 1)
+set(BOOST2_MINOR_VERSION 76)
+set(BOOST2_PATCH_VERSION 0)
 set(CPP_HTTPLIB_VERSION 0.23.1)
-set(CURL2_VERSION 8_15_0)
 set(CURL_VERSION 8.15.0)
-set(EXPAT2_VERSION 2_7_1)
+set(CURL2_VERSION 8_15_0)
 set(EXPAT_VERSION 2.7.1)
+set(EXPAT2_VERSION 2_7_1)
 set(GCC_VERSION 15.1.0)
 set(GTEST_VERSION 1.17.0)
 set(ICU_VERSION 76-1)
@@ -22,9 +22,9 @@ set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.15)
 set(ROCKSDB_VERSION 10.4.2)
 set(SPDLOG_VERSION 1.15.3)
-set(SQLITE2_VERSION 3.50.3)
 set(SQLITE_VERSION 3500300)
+set(SQLITE2_VERSION 3.50.3)
 set(STDUUID_VERSION 1.2.3)
-set(WINFSP2_VERSION 2.1)
 set(WINFSP_VERSION 2.1.25156)
+set(WINFSP2_VERSION 2.1)
 set(ZLIB_VERSION 1.3.1)
--- a/docker/x86_64/mingw64
+++ b/docker/x86_64/mingw64
@@ -924,6 +924,7 @@ RUN if [ -f "/3rd_party/rocksdb-${MY_ROCKSDB_VERSION}.tar.gz" ]; then \
        -DROCKSDB_INSTALL_ON_WINDOWS=ON \
        -DWITH_BENCHMARK=OFF \
        -DWITH_BENCHMARK_TOOLS=OFF \
+        -DWITH_BZ2=OFF \
        -DWITH_CORE_TOOLS=OFF \
        -DWITH_EXAMPLES=OFF \
        -DWITH_GFLAGS=OFF \