From afa7a1f758e8b6b1adcc716da0bed9ef2ab6bd52 Mon Sep 17 00:00:00 2001 From: Fs Date: Thu, 18 Jan 2024 08:06:26 +0800 Subject: [PATCH] fix pod2man detection Signed-off-by: Fs --- .github/workflows/cmake.yml | 4 ++-- doc/CMakeLists.txt | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index dfdff1a..4ee2f4b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -271,7 +271,7 @@ jobs: set path=${{ github.workspace }}\mingw\mingw${{ matrix.toolchain.bit }}\\bin;%path% mkdir -p "build" cd "build" - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/openssl${{ env.FS_OPENSSL_VERSION_STR }}-${{ env.FS_OPENSSL_PACKAGE_STR }}" -DOPENSSL_ASM=${{ matrix.asm }} -DOPENSSL_THREADS=${{ matrix.threads }} -DPOD2MAN="C:\Strawberry\perl\bin\pod2man.bat" "${{ github.workspace }}/openssl-externalCMake" + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/openssl${{ env.FS_OPENSSL_VERSION_STR }}-${{ env.FS_OPENSSL_PACKAGE_STR }}" -DOPENSSL_ASM=${{ matrix.asm }} -DOPENSSL_THREADS=${{ matrix.threads }} "${{ github.workspace }}/openssl-externalCMake" cmake --build . --parallel cmake --build . --parallel -t package - uses: actions/upload-artifact@v4 @@ -334,7 +334,7 @@ jobs: call "${{ matrix.toolchain.call }}" mkdir -p "build" cd "build" - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/openssl${{ env.FS_OPENSSL_VERSION_STR }}-${{ env.FS_OPENSSL_PACKAGE_STR }}" -DOPENSSL_ASM=${{ matrix.asm.value }} -DOPENSSL_NASM=${{ matrix.asm.nasm }} -DPOD2MAN="C:\Strawberry\perl\bin\pod2man.bat" "${{ github.workspace }}/openssl-externalCMake" + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/openssl${{ env.FS_OPENSSL_VERSION_STR }}-${{ env.FS_OPENSSL_PACKAGE_STR }}" -DOPENSSL_ASM=${{ matrix.asm.value }} -DOPENSSL_NASM=${{ matrix.asm.nasm }} "${{ github.workspace }}/openssl-externalCMake" cmake --build . --parallel cmake --build . --parallel -t package - uses: actions/upload-artifact@v4 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 96a933b..c345564 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Unlicense -find_program(POD2MAN "pod2man") +get_filename_component(PERL_PATH "${PERL_EXECUTABLE}" DIRECTORY) +find_program(POD2MAN + NAMES "pod2man" "pod2man.bat" + HINTS "${PERL_PATH}" +) if (NOT POD2MAN) set(POD2MAN "${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/openssl/util/pod2man.pl" CACHE STRING "" FORCE)