This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new 90ed988f Make static linkage compatible with vcpkg x64-windows-static
(#750)
90ed988f is described below
commit 90ed988f6e84d3ed1ce938c7ab841a7f03aa128b
Author: Stephen Webb <[email protected]>
AuthorDate: Wed Sep 2 12:11:26 2026 +1000
Make static linkage compatible with vcpkg x64-windows-static (#750)
* Increment minimum CMake version to 3.15 to fix "mismatch detected for
'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value
'MDd_DynamicDebug'"
---
.github/workflows/log4cxx-windows-static.yml | 13 +++++++------
.github/workflows/log4cxx-windows.yml | 2 +-
CMakeLists.txt | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/log4cxx-windows-static.yml
b/.github/workflows/log4cxx-windows-static.yml
index f9c0078c..8db6fc5d 100644
--- a/.github/workflows/log4cxx-windows-static.yml
+++ b/.github/workflows/log4cxx-windows-static.yml
@@ -18,7 +18,7 @@ on: [push, pull_request]
jobs:
job:
- name: ${{ matrix.os }}-${{ matrix.cxx }}-build-and-test
+ name: static-${{ matrix.name }}-build-and-test
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
@@ -28,7 +28,7 @@ jobs:
- name: windows-2022
os: windows-2022
vcpkg_ref: 2025.07.25
- - name: windows-2025
+ - name: windows-2025-fmt
os: windows-2025
vcpkg_options: fmt
vcpkg_ref: 2026.05.25
@@ -80,7 +80,9 @@ jobs:
-DBUILD_SHARED_LIBS=off `
-DLOG4CXX_MULTIPROCESS_ROLLING_FILE_APPENDER=on `
-DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin `
-
"-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" `
+
"-DCMAKE_TOOLCHAIN_FILE=$ROOT/vcpkg/scripts/buildsystems/vcpkg.cmake" `
+ "-DVCPKG_TARGET_TRIPLET=x64-windows-static" `
+ "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug" `
-S "$ROOT/main" `
-B "$ROOT/build"
@@ -90,8 +92,7 @@ jobs:
shell: pwsh
timeout-minutes: 10
run: |
- cd main
- cd build
- ctest -C Debug --output-on-failure
+ $ROOT=Get-Location
+ ctest --test-dir "$ROOT/build" -C Debug --output-on-failure
diff --git a/.github/workflows/log4cxx-windows.yml
b/.github/workflows/log4cxx-windows.yml
index 218d2003..7ce69ac3 100644
--- a/.github/workflows/log4cxx-windows.yml
+++ b/.github/workflows/log4cxx-windows.yml
@@ -18,7 +18,7 @@ on: [push, pull_request]
jobs:
job:
- name: ${{ matrix.os }}-${{ matrix.cxx }}-build-and-test
+ name: ${{ matrix.name }}-build-and-test
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 194a3e6b..b294dc94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.15)
include(src/cmake/projectVersionDetails.cmake)
project(log4cxx VERSION ${log4cxx_VER} LANGUAGES CXX)
include(CTest)
