[cmake] Update static dependencies to fix build issues

CHANGES

@@ -3,8 +3,8 @@
 	std : fixed put_env when null is passed in (#229 https://github.com/HaxeFoundation/haxe/issues/10395)
 	std : added sys_cpu_arch (#275)
 	std : fix sys_is64 returning false on 64 bit Windows (#276)
-	cmake : updated apr version for Mac
-	all : fixed various build issues on macOS Catalina
+	all : fixed various build issues on macOS Catalina and Big Sur
+	cmake : update all dependencies
 
 2019-10-19 : 2.3.0
 	std : added socket_set_broadcast function (#190)

CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.10.2)
 
-if (NOT ${CMAKE_VERSION} VERSION_LESS 3.24)
+if (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.24)
 	cmake_policy(VERSION 3.24)
-elseif (NOT ${CMAKE_VERSION} VERSION_LESS 3.19)
+elseif (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.19)
 	cmake_policy(VERSION 3.19)
 endif()
-cmake_policy(SET CMP0068 NEW)
+
+project(Neko C)
 
 include(GNUInstallDirs)
 include(CheckCCompilerFlag)
 include(CheckIncludeFile)
 include(TestBigEndian)
-project(Neko C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
@@ -57,7 +57,7 @@ option(WITH_REGEXP "Build with Perl-compatible regex support." ON)
 option(WITH_UI "Build with GTK-3 UI support." ON)
 option(WITH_SSL "Build with SSL support." ON)
 option(WITH_MYSQL "Build with MySQL support." ON)
-option(WITH_SQLITE "Build with Sqlite support." ON)
+option(WITH_SQLITE "Build with SQLite support." ON)
 option(WITH_APACHE "Build with Apache modules." ON)
 option(WITH_NEKOML "Build NekoML." ON)
 
@@ -102,7 +102,7 @@ set(external_deps
 	OpenSSL
 	MariaDBConnector
 	pcre2
-	Sqlite3
+	SQLite3
 	APR
 	APRutil
 	Apache
@@ -130,9 +130,6 @@ if (STATIC_DEPS STREQUAL "all")
 	if (WIN32)
 		list(REMOVE_ITEM STATIC_DEPS_ALL BoehmGC)
 	endif()
-	if (APPLE)
-		list(REMOVE_ITEM STATIC_DEPS_ALL APRutil)
-	endif()
 	set(STATIC_DEPS ${STATIC_DEPS_ALL} CACHE STRING "${STATIC_DEPS_DOC}" FORCE)
 elseif (STATIC_DEPS STREQUAL "none")
 	message(STATUS "set STATIC_DEPS to nothing")
@@ -144,8 +141,6 @@ else()
 			message(FATAL_ERROR "Invalid STATIC_DEPS. There is no ${dep} in the list of ${external_deps}")
 		elseif(WIN32 AND dep STREQUAL "BoehmGC")
 			message(FATAL_ERROR "Cannot link ${dep} statically on Windows")
-		elseif(APPLE AND dep STREQUAL "APRutil")
-			message(WARNING "${dep} is redundant as it was merged into APR in version 2.0, which is the version we build with on macOS.")
 		endif()
 	endforeach()
 endif()

README.md

@@ -115,11 +115,11 @@ Settings that allow to exclude libraries and their dependencies from the build;
 
 Default value: `all` for Windows, `none` otherwise
 
-It defines the dependencies that should be linked statically. Can be `all`, `none`, or a list of library names (e.g. `BoehmGC;Zlib;OpenSSL;MariaDBConnector;pcre2;Sqlite3;APR;APRutil;Apache;MbedTLS`).
+It defines the dependencies that should be linked statically. Can be `all`, `none`, or a list of library names (e.g. `BoehmGC;Zlib;OpenSSL;MariaDBConnector;pcre2;SQLite3;APR;APRutil;Apache;MbedTLS`).
 
 CMake will automatically download and build the specified dependencies into the build folder. If a library is not present in this list, it should be installed manually, and it will be linked dynamically.
 
-All third-party libraries, except GTK+3 (Linux) and BoehmGC on Windows, can be linked statically. We do not support statically linking GTK+3 due to the difficulty of building it and its own dependencies. Additionally, we do not support statically linking the BoehmGC library on Windows systems. Finally, on MacOS, APRutil cannot be linked statically as it has been merged with APR 2.0, which is used on MacOS builds.
+All third-party libraries, except GTK+3 (Linux) and BoehmGC on Windows, can be linked statically. We do not support statically linking GTK+3 due to the difficulty of building it and its own dependencies. Additionally, we do not support statically linking the BoehmGC library on Windows systems.
 
 #### `RELOCATABLE`
 

cmake/FindSQLite3.cmake

@@ -0,0 +1,104 @@
+# https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/FindSQLite3.cmake
+
+#[==[
+CMake - Cross Platform Makefile Generator
+Copyright 2000-2023 Kitware, Inc. and Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name of Kitware, Inc. nor the names of Contributors
+  may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+]==]
+
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindSQLite3
+-----------
+
+.. versionadded:: 3.14
+
+Find the SQLite libraries, v3
+
+IMPORTED targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` target:
+
+``SQLite::SQLite3``
+
+Result variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables if found:
+
+``SQLite3_INCLUDE_DIRS``
+  where to find sqlite3.h, etc.
+``SQLite3_LIBRARIES``
+  the libraries to link against to use SQLite3.
+``SQLite3_VERSION``
+  version of the SQLite3 library found
+``SQLite3_FOUND``
+  TRUE if found
+
+#]=======================================================================]
+
+
+# Look for the necessary header
+find_path(SQLite3_INCLUDE_DIR NAMES sqlite3.h)
+mark_as_advanced(SQLite3_INCLUDE_DIR)
+
+# Look for the necessary library
+find_library(SQLite3_LIBRARY NAMES sqlite3 sqlite)
+mark_as_advanced(SQLite3_LIBRARY)
+
+# Extract version information from the header file
+if(SQLite3_INCLUDE_DIR)
+    file(STRINGS ${SQLite3_INCLUDE_DIR}/sqlite3.h _ver_line
+         REGEX "^#define SQLITE_VERSION  *\"[0-9]+\\.[0-9]+\\.[0-9]+\""
+         LIMIT_COUNT 1)
+    string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+"
+           SQLite3_VERSION "${_ver_line}")
+    unset(_ver_line)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLite3
+    REQUIRED_VARS SQLite3_INCLUDE_DIR SQLite3_LIBRARY
+    VERSION_VAR SQLite3_VERSION)
+
+# Create the imported target
+if(SQLite3_FOUND)
+    set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
+    set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
+    if(NOT TARGET SQLite::SQLite3)
+        add_library(SQLite::SQLite3 UNKNOWN IMPORTED)
+        set_target_properties(SQLite::SQLite3 PROPERTIES
+            IMPORTED_LOCATION             "${SQLite3_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIR}")
+    endif()
+endif()

cmake/patch_apache.cmake

@@ -0,0 +1,26 @@
+# https://github.com/apache/httpd/commit/dd4561dd17a669a8c1757ada0ca875dfa840d0e7
+# https://github.com/apache/httpd/pull/343
+
+set(cmakelists ${apache_source}/CMakeLists.txt)
+
+file(READ ${cmakelists} content)
+
+string(REPLACE
+	"pcre2-8d.lib"
+	"pcre2-8-staticd.lib"
+	content "${content}"
+)
+
+string(REPLACE
+	"pcre2-8.lib"
+	"pcre2-8-static.lib"
+	content "${content}"
+)
+
+string(REPLACE
+	"\"-DHAVE_PCRE2\""
+	"\"-DHAVE_PCRE2 -DPCRE2_STATIC\""
+	content "${content}"
+)
+
+file(WRITE ${cmakelists} "${content}")

cmake/patch_apr-util.cmake

@@ -0,0 +1,28 @@
+# This is necessary so that the CMAKE_FIND_LIBRARY_SUFFIXES is preserved when
+# locating expat, since it gets reset when PROJECT is called
+
+set(cmakelists "${apr-util_source}/CMakeLists.txt")
+
+file(READ ${cmakelists} content)
+
+string(REPLACE
+"PROJECT(APR-Util C)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+FIND_PACKAGE(OpenSSL)
+
+FIND_PACKAGE(EXPAT)"
+
+"CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+FIND_PACKAGE(OpenSSL)
+
+FIND_PACKAGE(EXPAT)
+
+PROJECT(APR-Util C)"
+
+	content "${content}"
+)
+
+file(WRITE ${cmakelists} "${content}")

cmake/patch_mariadb.cmake

@@ -4,23 +4,10 @@ set(cmakelists ${mariadb_source}/CMakeLists.txt)
 file(READ ${cmakelists} content)
 
 # do not use replace /MD with /MT
-string(REPLACE 
+string(REPLACE
 	"STRING(REPLACE \"/MD\" \"/MT\" COMPILER_FLAGS \${COMPILER_FLAGS})"
 	"# STRING(REPLACE \"/MD\" \"/MT\" COMPILER_FLAGS \${COMPILER_FLAGS})"
-	content ${content}
-)
-
-file(WRITE ${cmakelists} ${content})
-
-set(cmakelists ${mariadb_source}/cmake/ConnectorName.cmake)
-
-file(READ ${cmakelists} content)
-
-# Fix broken syntax on newer CMake
-string(REPLACE
-	"  END()"
-	"  ENDIF()"
-	content ${content}
+	content "${content}"
 )
 
-file(WRITE ${cmakelists} ${content})
+file(WRITE ${cmakelists} "${content}")