From 04ed6d435c50e6938246c4237c4acedde021ad74 Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Mon, 23 Sep 2024 20:45:38 +0800 Subject: [PATCH] fix(CI): correct cmake prefix path for appveyor build --- .github/workflows/windows.yml | 4 ++-- appveyor.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a284f67..4cff185 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,11 +34,11 @@ jobs: set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin mkdir dependencies_src :: ===== uchardet ===== - echo "::group::build uchardet" + echo ::group::build uchardet git clone -q https://gitlab.freedesktop.org/BLumia/uchardet.git --branch msvc dependencies_src/uchardet cmake .\dependencies_src\uchardet -Bbuild_dependencies/uchardet -DBUILD_BINARY=OFF -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error cmake --build build_dependencies/uchardet --config Release --target=install -j || goto :error - echo "::endgroup::" + echo ::endgroup:: :: ===== pkg-config ===== choco install pkgconfiglite set PKG_CONFIG_PATH=%PWD%/dependencies_bin/lib/pkgconfig diff --git a/appveyor.yml b/appveyor.yml index c2d0531..011999b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ build_script: # finally... - mkdir build - cd build - - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=%CMAKE_INSTALL_ROOT% -DCMAKE_INSTALL_PREFIX='%cd%' + - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=%PACKAGE_INSTALL_ROOT% -DCMAKE_INSTALL_PREFIX='%cd%' - cmake --build . - cmake --build . --target install # fixme: I don't know how to NOT make the binary installed to the ./bin/ folder...