diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index d4458a2d50..ba2fe7cb65 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -10,9 +10,15 @@ vcpkg_extract_source_archive( fix-find-package.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + qt LOG4CXX_QT_SUPPORT + fmt ENABLE_FMT_LAYOUT +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DLOG4CXX_INSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it -DBUILD_TESTING=OFF ) diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index 397e0f44b9..b31ed98414 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "log4cxx", "version": "1.2.0", + "port-version": 1, "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "license": "Apache-2.0", @@ -17,5 +18,22 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "fmt": { + "description": "Include the log4cxx::FMTLayout class that uses libfmt to layout messages", + "dependencies": [ + "fmt" + ] + }, + "qt": { + "description": "Allow QString values in the LOG4CXX_WARN, LOG4CXX_INFO, LOG4CXX_DEBUG etc. macros", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index e85e49127e..9d0a36bdee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5582,7 +5582,7 @@ }, "log4cxx": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "loguru": { "baseline": "2.1.0", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 071d48a2df..58fa5cae7d 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69b1cd84fe4dce29fda6b300bf18ebc8de1aa0de", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "d24b9474cf8ec8bca0ec3dce1f0d9e4a030836bd", "version": "1.2.0",