From 11cc70f11926c0b22d742e760c4343e8cedec1b5 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 8 Sep 2024 15:29:03 +0200 Subject: [PATCH] Enforce proper Windows SDK version for CMake builds This may be useful or not, but since it is done for MSBuild builds, it should probably be done for CMake builds, too. --- .github/workflows/freetype_cmake.yml | 2 +- .github/workflows/libavif.yml | 6 +++--- .github/workflows/libjpeg.yml | 2 +- .github/workflows/liblzma.yml | 2 +- .github/workflows/libmemcached.yml | 2 +- .github/workflows/librdkafka.yml | 2 +- .github/workflows/libssh2.yml | 2 +- .github/workflows/libtidy.yml | 2 +- .github/workflows/libzip.yml | 4 ++-- .github/workflows/libzstd.yml | 2 +- .github/workflows/nghttp2.yml | 2 +- .github/workflows/pslib.yml | 2 +- .github/workflows/wineditline.yml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/freetype_cmake.yml b/.github/workflows/freetype_cmake.yml index 668a7b3..e0b06fa 100644 --- a/.github/workflows/freetype_cmake.yml +++ b/.github/workflows/freetype_cmake.yml @@ -32,7 +32,7 @@ jobs: id: virtuals run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}} - name: Configure freetype - run: cd freetype && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .. + run: cd freetype && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} .. - name: Build freetype run: cd freetype\build && cmake --build . --config RelWithDebInfo - name: Install freetype diff --git a/.github/workflows/libavif.yml b/.github/workflows/libavif.yml index 1c68d08..39ec845 100644 --- a/.github/workflows/libavif.yml +++ b/.github/workflows/libavif.yml @@ -40,10 +40,10 @@ jobs: uses: ilammy/setup-nasm@v1 - name: Configure aom for x64 if: matrix.arch == 'x64' - run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE4_1=1 -DENABLE_SSE4_2=1 -DENABLE_AVX=1 -DENABLE_AVX2=1 .. + run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE4_1=1 -DENABLE_SSE4_2=1 -DENABLE_AVX=1 -DENABLE_AVX2=1 .. - name: Configure aom for x86 if: matrix.arch == 'x86' - run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSSE3=0 -DENABLE_SSE4_1=0 -DENABLE_SSE4_2=0 -DENABLE_AVX=0 -DENABLE_AVX2=0 .. + run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSSE3=0 -DENABLE_SSE4_1=0 -DENABLE_SSE4_2=0 -DENABLE_AVX=0 -DENABLE_AVX2=0 .. - name: Build aom run: cd libavif\ext\aom\build.libavif && cmake --build . --config Release - name: Install aom @@ -53,7 +53,7 @@ jobs: xcopy Release\aom.lib .\aom_a.lib* xcopy .\aom_a.lib ..\..\..\..\install\lib\ - name: Configure libavif - run: cd libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DAVIF_CODEC_AOM=1 -DAVIF_LOCAL_AOM=1 -DAVIF_ENABLE_WERROR=0 -DBUILD_SHARED_LIBS=0 . + run: cd libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DAVIF_CODEC_AOM=1 -DAVIF_LOCAL_AOM=1 -DAVIF_ENABLE_WERROR=0 -DBUILD_SHARED_LIBS=0 . - name: Build libavif run: cd libavif && cmake --build . --config RelWithDebInfo - name: Install libavif diff --git a/.github/workflows/libjpeg.yml b/.github/workflows/libjpeg.yml index 7e0272a..bfc8a8c 100644 --- a/.github/workflows/libjpeg.yml +++ b/.github/workflows/libjpeg.yml @@ -32,7 +32,7 @@ jobs: id: virtuals run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}} - name: Configure libjpeg - run: cd libjpeg && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DWITH_JPEG8=1 -DWITH_CRT_DLL=1 -DENABLE_SHARED=0 -DWITH_TURBOJPEG=0 . + run: cd libjpeg && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DWITH_JPEG8=1 -DWITH_CRT_DLL=1 -DENABLE_SHARED=0 -DWITH_TURBOJPEG=0 . - name: Build libjpeg run: cd libjpeg && cmake --build . --config RelWithDebInfo - name: Install libjpeg diff --git a/.github/workflows/liblzma.yml b/.github/workflows/liblzma.yml index 5c938a9..57e99a9 100644 --- a/.github/workflows/liblzma.yml +++ b/.github/workflows/liblzma.yml @@ -32,7 +32,7 @@ jobs: id: virtuals run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}} - name: Configure liblzma - run: cd liblzma && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .. + run: cd liblzma && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} .. - name: Build liblzma run: cd liblzma\build && cmake --build . --config RelWithDebInfo - name: Install liblzma diff --git a/.github/workflows/libmemcached.yml b/.github/workflows/libmemcached.yml index fb81266..d4707e4 100644 --- a/.github/workflows/libmemcached.yml +++ b/.github/workflows/libmemcached.yml @@ -39,7 +39,7 @@ jobs: run: choco install winflexbison3 - run: path - name: Configure libmemcached - run: cd libmemcached && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .. + run: cd libmemcached && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} .. - name: Build libmemcached run: cd libmemcached\build && cmake --build . --config RelWithDebInfo - name: Install libmemcached diff --git a/.github/workflows/librdkafka.yml b/.github/workflows/librdkafka.yml index bca12a8..4aa0f7c 100644 --- a/.github/workflows/librdkafka.yml +++ b/.github/workflows/librdkafka.yml @@ -40,7 +40,7 @@ jobs: - name: Patch librdkafka run: cd librdkafka && git apply --ignore-whitespace ..\winlib-builder\patches\librdkafka.patch - name: Configure librdkafka - run: cd librdkafka && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DWITH_ZSTD=ON -DWITH_SSL=ON -DWITH_ZLIB=ON -DCMAKE_PREFIX_PATH:PATH=${{github.workspace}}\deps -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DZSTD_LIBRARY:PATH=${{github.workspace}}\deps\lib\libzstd_a.lib . + run: cd librdkafka && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DWITH_ZSTD=ON -DWITH_SSL=ON -DWITH_ZLIB=ON -DCMAKE_PREFIX_PATH:PATH=${{github.workspace}}\deps -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DZSTD_LIBRARY:PATH=${{github.workspace}}\deps\lib\libzstd_a.lib . - name: Build librdkafka run: cd librdkafka && cmake --build . --config RelWithDebInfo - name: Install librdkafka diff --git a/.github/workflows/libssh2.yml b/.github/workflows/libssh2.yml index 563fb31..0d2325e 100644 --- a/.github/workflows/libssh2.yml +++ b/.github/workflows/libssh2.yml @@ -38,7 +38,7 @@ jobs: - name: Fetch dependencies run: powershell winlib-builder/scripts/fetch-deps -lib libssh2 -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}} - name: Configure libssh2 - run: cd libssh2 && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCRYPTO_BACKEND=OpenSSL -DOPENSSL_ROOT_DIR:PATH=${{github.workspace}}/deps -DENABLE_ZLIB_COMPRESSION=ON -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}/deps/include -DZLIB_LIBRARY:FILEPATH=${{github.workspace}}/deps/lib/zlib_a.lib -DBUILD_SHARED_LIBS=ON . + run: cd libssh2 && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DCRYPTO_BACKEND=OpenSSL -DOPENSSL_ROOT_DIR:PATH=${{github.workspace}}/deps -DENABLE_ZLIB_COMPRESSION=ON -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}/deps/include -DZLIB_LIBRARY:FILEPATH=${{github.workspace}}/deps/lib/zlib_a.lib -DBUILD_SHARED_LIBS=ON . - name: Build libssh2 run: cd libssh2 && cmake --build . --config RelWithDebInfo - name: Install libssh2 diff --git a/.github/workflows/libtidy.yml b/.github/workflows/libtidy.yml index 8c7c5a5..bf75b2c 100644 --- a/.github/workflows/libtidy.yml +++ b/.github/workflows/libtidy.yml @@ -38,7 +38,7 @@ jobs: - name: Fetch dependencies run: powershell winlib-builder/scripts/fetch-deps -lib libtidy -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}} - name: Configure libtidy - run: cd libtidy && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} . + run: cd libtidy && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} . - name: Build libtidy run: cd libtidy && cmake --build . --config RelWithDebInfo - name: Install libtidy diff --git a/.github/workflows/libzip.yml b/.github/workflows/libzip.yml index ca52ba2..161fda5 100644 --- a/.github/workflows/libzip.yml +++ b/.github/workflows/libzip.yml @@ -39,10 +39,10 @@ jobs: run: powershell winlib-builder/scripts/fetch-deps -lib libzip -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}} - name: Configure libzip for PHP < 8.0 if: github.event.inputs.php < 8.0 - run: cd libzip && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF .. + run: cd libzip && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF .. - name: Configure libzip for PHP >= 8.0 if: github.event.inputs.php >= 8.0 - run: cd libzip && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DLIBLZMA_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DLIBLZMA_LIBRARY:PATH=${{github.workspace}}\deps\lib\liblzma_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF .. + run: cd libzip && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DLIBLZMA_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DLIBLZMA_LIBRARY:PATH=${{github.workspace}}\deps\lib\liblzma_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF .. - name: Build libzip run: cd libzip\build && cmake --build . --config RelWithDebInfo - name: Install libzip diff --git a/.github/workflows/libzstd.yml b/.github/workflows/libzstd.yml index d98e3ad..8df3158 100644 --- a/.github/workflows/libzstd.yml +++ b/.github/workflows/libzstd.yml @@ -38,7 +38,7 @@ jobs: - name: Patch libzstd run: cd libzstd && git apply --ignore-whitespace ..\winlib-builder\patches\libzstd.patch - name: Configure libzstd - run: cd libzstd\build\cmake && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} . + run: cd libzstd\build\cmake && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} . - name: Build libzstd run: cd libzstd\build\cmake && cmake --build . --config RelWithDebInfo - name: Install libzstd diff --git a/.github/workflows/nghttp2.yml b/.github/workflows/nghttp2.yml index 761b553..3dee54d 100644 --- a/.github/workflows/nghttp2.yml +++ b/.github/workflows/nghttp2.yml @@ -38,7 +38,7 @@ jobs: - name: Fetch dependencies run: powershell winlib-builder/scripts/fetch-deps -lib nghttp2 -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}} - name: Configure nghttp2 - run: cd nghttp2 && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} . + run: cd nghttp2 && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} . - name: Build nghttp2 run: cd nghttp2 && cmake --build . --config RelWithDebInfo --target nghttp2 - name: Install nghttp2 diff --git a/.github/workflows/pslib.yml b/.github/workflows/pslib.yml index 895faf6..c8ef86b 100644 --- a/.github/workflows/pslib.yml +++ b/.github/workflows/pslib.yml @@ -36,7 +36,7 @@ jobs: id: virtuals run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}} - name: Configure pslib - run: cd pslib && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} . + run: cd pslib && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} . - name: Build pslib run: cd pslib && cmake --build . --config RelWithDebInfo - name: Install pslib diff --git a/.github/workflows/wineditline.yml b/.github/workflows/wineditline.yml index 9a6b72d..3f69437 100644 --- a/.github/workflows/wineditline.yml +++ b/.github/workflows/wineditline.yml @@ -32,7 +32,7 @@ jobs: id: virtuals run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}} - name: Configure wineditline - run: cd wineditline && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .. + run: cd wineditline && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} .. - name: Build wineditline run: cd wineditline\build && cmake --build . --config RelWithDebInfo - name: Install wineditline