updated build system

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.28)
 
 cmake_policy(SET CMP0135 NEW)
 cmake_policy(SET CMP0144 NEW)

cmake/libraries.cmake

@@ -1,6 +1,11 @@
 find_package(PkgConfig REQUIRED)
 
+set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
+set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
+set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
+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/openssl.cmake)
 

cmake/libraries/boost.cmake

@@ -18,7 +18,6 @@ if(PROJECT_ENABLE_BOOST)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_BOOST)
 
-    set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
     find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} EXACT
       REQUIRED
       COMPONENTS

cmake/libraries/curl.cmake

@@ -2,7 +2,6 @@ if(PROJECT_ENABLE_CURL)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_CURL)
 
-    set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
     find_package(CURL ${CURL_VERSION} REQUIRED)
 
     include_directories(BEFORE SYSTEM ${CURL_INCLUDE_DIRS})

cmake/libraries/openssl.cmake

@@ -1,14 +1,12 @@
 set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
+
 if(PROJECT_ENABLE_OPENSSL)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_OPENSSL)
 
-    set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
     find_package(OpenSSL ${OPENSSL_VERSION} REQUIRED)
 
-    include_directories(BEFORE SYSTEM
-      ${OPENSSL_INCLUDE_DIR}
-    )
+    include_directories(BEFORE SYSTEM ${OPENSSL_INCLUDE_DIR})
 
     link_libraries(
       OpenSSL::Crypto
@@ -27,12 +25,6 @@ if(PROJECT_ENABLE_OPENSSL)
       set(OPENSSL_CROSS_PREFIX "--cross-compile-prefix=x86_64-w64-mingw32-")
     endif()
 
-    if(PROJECT_BUILD_SHARED_LIBS)
-      set(OPENSSL_NO_SHARED shared)
-    else()
-      set(OPENSSL_NO_SHARED no-shared)
-    endif()
-
     ExternalProject_Add(openssl_project
       PREFIX external
       URL ${PROJECT_3RD_PARTY_DIR}/openssl-${OPENSSL_VERSION}.tar.gz
@@ -45,7 +37,7 @@ if(PROJECT_ENABLE_OPENSSL)
         --prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
         no-apps
         no-docs
-        ${OPENSSL_NO_SHARED}
+        no-shared
       BUILD_COMMAND make -j1
       INSTALL_COMMAND make install
     )

docker/x86_64/mingw64

@@ -404,6 +404,7 @@ RUN if [ -f "/3rd_party/openssl-${MY_OPENSSL_VERSION}.tar.gz" ]; then \
         --cross-compile-prefix=${MY_MINGW_PREFIX}- \
         --prefix=${MY_MINGW_DIR} \
         mingw64 \
+        no-shared \
         no-apps \
         no-docs \
       && make -j${MY_NUM_JOBS} \
@@ -611,7 +612,7 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \
       && cd build \
       && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
         -DBUILD_CURL_EXE=ON \
-        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_SHARED_LIBS=OFF \
         -DBUILD_STATIC_LIBS=ON \
         -DBUILD_TESTING=OFF \
         -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \