Reorganise external libs to separate subdirectory (#4996)

* chore(PCRE): properly detect library type on newer macOS

* chore(ZLIB): move source files to own zlib directory and update CMake files.

* chore(PCRE): move source files to own pcre2 directory and update CMake files.

* chore(UTF8PROC): move source files to own utf8proc directory and update CMake files.

* chore(ZLIB): remove header files

* chore(PDJSON): move source files to own pdjson directory and update CMake files.

* chore(SQLite3): move source files to own sqlite3 directory and update CMake files.

* chore(UNBUNDLED): Correct includes.

* chore(expat): move source files to own expat directory and update CMake files.

* chore(wepoll): move source files to own wepoll directory and update CMake files.

* chore(7zip): move source files to own 7zip directory and update CMake files.

* chore(CMake): fix compile and link flags for dependent static libraries

* chore(CMake): set PCRE2_STATIC when building PCRE2.

* chore(SQLite3): Set SQLITE_THREADSAFE for unbundled build, add warnings.

* chore(CMake): Modifications to build and link properly static target libraries (using OBJECT library type and link using BUILD_LOCAL_INTERFACE)

* chore(CMake): fix order of includes in main CMakeLists.txt.

* chore(CI): Build mysql tests with cmake.

* chore(CI): Build mongodb, redis, sqlite no parser tests with cmake.

* chore(CI): Build odbc tests with cmake.

* chore(CI): Build more ations with cmake, other fixes.

* chore(CI): Fixes for macOS

* chore(CMake): extract hpdf and png files to own directories in dependencies

* fix(CMake): include dependencies after all module dependencies are resolved.

* fix(CMake): Improve dependency handling of dependencies to compile them only when necessary.

* fix(CMake): PDF: move t4.h to proper directory, modify include.

* fix(CMake): Fixes to link properly on all platforms.

* fix(CMAKE): Wrong ENABLE for SQLITE

* enh(PDF): Remove dependencies on hpdf headers from Poco::PDF interface and make usage of hpdf only internal.

* enh(CI): Convert more jobs to use cmake.

* enh(CI): Convert macOS sanitizer jobs to use cmake.

* enh(mkrelease): Copy dependencies when creating release package.

* eng(CMake): Add missing POCO_SO option to enable/disable small object optimization.

* enh(CI): Run linux sanitizer with cmake, various fixes and improvements.

* fix(CMake): bundled build: ZLIB::ZLIB is already linked with Foundation, no need to link again to Poco::Zip

* fix(CI): vptr undefined sanitizer causes foundation tests to fail when linking, disable it

* chore(tests): Minor code improvements.

* fix(AsyncNotificationCenter): fix a data race with member _listsEmpty by making it atomic.

* eng(CI): Add a few more time sensitive tests to cppignore.lnx

* chore(Thread): Code updates.

* eng(CI): Add a few more time sensitive tests to cppignore.lnx

* fix(AsyncNotificationCenter): must join threads to avoid data race in dtor.

* chore(CI): Pass TSAN_OPTIONS to jobs where necessary

* chore(CI): run rests without sudo, compile with parallelism

* chore(CI): Use POCO_MINIMAL_BUILD to simplify CMake configure lines.

* chore(CI): Add 32-bit Windows VS build

* chore(CMake): Printout cmake generator platform.

* chore(CMake): linux-gcc-make-armv7l -> linux-gcc-cmake-armv7l

* chore(ci): windows-2025-msvc-cmake-32bit -> windows-2025-msvc-cmake-Win32

* chore(CI): Convert all remaining jobs to CMake.

* chore(make): Prevent building with make.

* chore(CodeQL): exclude all external code from CodeQL checks.

* chore(macOS): Set min support version to 13.3 to properly support C++20 standard.

Author: matejk

.github/workflows/ci.yml

@@ -72,29 +72,6 @@ jobs:
           overwrite: true
           retention-days: 1
 
-  linux-gcc-make-mkrelease:
-    runs-on: ubuntu-22.04
-    needs: mkrelease
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: posix-archives
-      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev
-      - run: rm poco-*-all.tar.gz
-      - run: mkdir poco && cd poco && tar xfz ../poco-*.tar.gz --strip-components=1
-      - run: cd poco && ./configure --everything && make all -s -j`nproc`
-
-  linux-gcc-make-mkrelease-all:
-    runs-on: ubuntu-22.04
-    needs: mkrelease
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: posix-archives
-      - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev
-      - run: mkdir poco && cd poco && tar xfz ../poco-*-all.tar.gz --strip-components=1
-      - run: cd poco && ./configure --everything && make all -s -j`nproc`
-
   linux-gcc-cmake-mkrelease:
     runs-on: ubuntu-22.04
     needs: mkrelease
@@ -118,31 +95,6 @@ jobs:
       - run: mkdir poco && cd poco && tar xfz ../poco-*-all.tar.gz --strip-components=1
       - run: cmake -Spoco -Bcmake-build -GNinja -DENABLE_PDF=OFF -DENABLE_TESTS=ON && cmake --build cmake-build --target all
 
-  windows-2022-msvc-buildwin-x64-mkrelease-all:
-    runs-on: windows-2022
-    needs: mkrelease_win
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: windows-archives
-      - run: |
-          7z x poco-*-all.zip
-          cd poco-*-all
-          .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform x64 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT"
-
-  windows-2022-msvc-buildwin-x64-mkrelease:
-    runs-on: windows-2022
-    needs: mkrelease_win
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: windows-archives
-      - run: |
-          rm poco-*-all.zip
-          7z x poco-*.zip
-          cd poco-*
-          .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform x64 -samples -tests
-
   windows-2022-msvc-cmake-mkrelease-all:
     runs-on: windows-2022
     needs: mkrelease_win

.github/workflows/packages-qa.yml

@@ -1,4 +1,8 @@
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.26.0)
+
+# MacOS version that has support for C++20
+# Must be set before the project.
+set(CMAKE_OSX_DEPLOYMENT_TARGET "13.3" CACHE STRING "macOS minimum supported target")
 
 project(Poco)
 
@@ -227,6 +231,9 @@ option(POCO_UNBUNDLED
 option(POCO_SQLITE_UNBUNDLED
 	"Set to OFF|ON (default is OFF) to control linking sqlite dependency as external" OFF)
 
+option(POCO_SOO
+	"Set to OFF|ON (default is ON) to control small object optimization in Poco::Foundation" ON)
+
 if (POCO_UNBUNDLED)
 	set(POCO_SQLITE_UNBUNDLED ON CACHE BOOL "Enable Unbundled SQLite" FORCE)
 endif()
@@ -257,10 +264,12 @@ if(ENABLE_FUZZING)
 endif()
 
 if(POCO_UNBUNDLED)
-	message(STATUS "Using external sqlite, zlib, pcre2, expat, libpng, ...")
-elseif (POCO_SQLITE_UNBUNDLED)
-	message(STATUS "Using external sqlite")
-	message(STATUS "Using internal zlib, pcre2, expat, libpng, ...")
+	if (POCO_SQLITE_UNBUNDLED)
+		message(STATUS "Using external sqlite")
+		message(STATUS "Using internal zlib, pcre2, expat, libpng, ...")
+	else()
+		message(STATUS "Using external sqlite, zlib, pcre2, expat, libpng, ...")
+	endif()
 else()
 	message(STATUS "Using internal sqlite, zlib, pcre2, expat, libpng, ...")
 endif()
@@ -402,6 +411,8 @@ endif()
 
 # - add required subdirectories
 
+add_subdirectory(dependencies)
+
 if(ENABLE_FOUNDATION)
 	add_subdirectory(Foundation)
 	list(APPEND Poco_COMPONENTS "Foundation")
@@ -623,8 +634,8 @@ install(
 		Devel
 )
 
-message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
-message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}")
+message(STATUS "CMake '${CMAKE_VERSION}' successfully configured '${PROJECT_NAME}'")
+message(STATUS "${PROJECT_NAME} package version: '${PROJECT_VERSION}'")
 if(BUILD_SHARED_LIBS)
 	message(STATUS "Building dynamic libraries")
 else()
@@ -637,6 +648,8 @@ endif()
 message(STATUS "[cmake] Build for OS type:      ${CMAKE_SYSTEM_NAME}")
 message(STATUS "[cmake] Build for OS version:   ${CMAKE_SYSTEM_VERSION}")
 message(STATUS "[cmake] Build for CPU type:     ${CMAKE_SYSTEM_PROCESSOR}")
+message(STATUS "[cmake] Generator:              ${CMAKE_GENERATOR}")
+message(STATUS "[cmake] Generator platorm:      ${CMAKE_GENERATOR_PLATFORM}")
 message(STATUS "[cmake] Build type:             ${CMAKE_BUILD_TYPE}")
 string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
 message(STATUS "[cmake] Build with C++ flags:   ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} ${CMAKE_CXX_FLAGS}")

CMakeLists.txt

@@ -6,22 +6,19 @@ POCO_SOURCES_AUTO(SQLITE_SRCS ${SRCS_G})
 file(GLOB_RECURSE HDRS_G "include/*.h")
 POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G})
 
-if(POCO_SQLITE_UNBUNDLED)
-	find_package(SQLite3 REQUIRED)
-else()
-	# sqlite3
-	POCO_SOURCES(SQLITE_SRCS sqlite3
-		src/sqlite3.c
-	)
-endif()
-
 # Version Resource
 if(MSVC AND BUILD_SHARED_LIBS)
 	source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 	list(APPEND SQLITE_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
 
 add_library(DataSQLite ${SQLITE_SRCS})
+if (POCO_UNBUNDLED)
+	target_link_libraries(DataSQLite PRIVATE SQLite::SQLite3)
+	target_compile_definitions(DataSQLite PUBLIC POCO_SQLITE_UNBUNDLED)
+else()
+	target_link_libraries(DataSQLite PRIVATE "$<BUILD_LOCAL_INTERFACE:SQLite::SQLite3>")
+endif()
 
 add_library(Poco::DataSQLite ALIAS DataSQLite)
 set_target_properties(DataSQLite
@@ -38,28 +35,6 @@ target_include_directories(DataSQLite
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
-if(POCO_SQLITE_UNBUNDLED)
-	target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3)
-	target_compile_definitions(DataSQLite PUBLIC POCO_SQLITE_UNBUNDLED)
-	target_compile_definitions(DataSQLite PRIVATE
-		SQLITE_THREADSAFE=1
-)
-else()
-	target_compile_definitions(DataSQLite PRIVATE
-		SQLITE_THREADSAFE=1
-		SQLITE_DISABLE_LFS
-		SQLITE_OMIT_UTF16
-		SQLITE_OMIT_PROGRESS_CALLBACK
-		SQLITE_OMIT_COMPLETE
-		SQLITE_OMIT_TCL_VARIABLE
-		SQLITE_OMIT_DEPRECATED
-	)
-	option(ENABLE_DATA_SQLITE_FTS5 "Enable SQLite FTS5 Extension" OFF)
-	if(ENABLE_DATA_SQLITE_FTS5)
-		target_compile_definitions(DataSQLite PRIVATE SQLITE_ENABLE_FTS5)
-	endif()
-endif()
-
 POCO_INSTALL(DataSQLite)
 POCO_GENERATE_PACKAGE(DataSQLite)
 

Data/SQLite/CMakeLists.txt

@@ -23,7 +23,7 @@
 #include "Poco/Data/LOB.h"
 #include "Poco/Any.h"
 #include "Poco/Dynamic/Var.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 
 
 namespace Poco {

Data/SQLite/include/Poco/Data/SQLite/Binder.h

@@ -33,7 +33,7 @@
 #include "Poco/UTFString.h"
 #include "Poco/Any.h"
 #include "Poco/Dynamic/Var.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 #include <vector>
 #include <utility>
 

Data/SQLite/include/Poco/Data/SQLite/Extractor.h

@@ -15,12 +15,7 @@
 #include "Poco/Data/SQLite/Connector.h"
 #include "Poco/Data/SQLite/SessionImpl.h"
 #include "Poco/Data/SessionFactory.h"
-#if defined(POCO_SQLITE_UNBUNDLED)
 #include <sqlite3.h>
-#else
-#include "sqlite3.h"
-#endif
-
 
 namespace Poco {
 namespace Data {

Data/SQLite/src/Connector.cpp

@@ -21,11 +21,7 @@
 #include "Poco/DateTimeParser.h"
 #include "Poco/Exception.h"
 #include "Poco/Debugger.h"
-#if defined(POCO_SQLITE_UNBUNDLED)
 #include <sqlite3.h>
-#else
-#include "sqlite3.h"
-#endif
 #include <cstdlib>
 
 

Data/SQLite/src/Extractor.cpp

@@ -18,11 +18,7 @@
 #include "Poco/String.h"
 #include <cstdlib>
 #include <cstring>
-#if defined(POCO_SQLITE_UNBUNDLED)
 #include <sqlite3.h>
-#else
-#include "sqlite3.h"
-#endif
 
 
 namespace Poco {

Data/SQLite/src/SQLiteStatementImpl.cpp

@@ -21,11 +21,7 @@
 #include "Poco/String.h"
 #include "Poco/Mutex.h"
 #include "Poco/Data/DataException.h"
-#if defined(POCO_SQLITE_UNBUNDLED)
 #include <sqlite3.h>
-#else
-#include "sqlite3.h"
-#endif
 #include <cstdlib>