From 887e05f54e3cad22253960969589bc816838e289 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Tue, 25 May 2021 16:34:02 -0400 Subject: [PATCH] CI, build fixups (#46) --- .github/workflows/ci.yml | 3 --- src/CMakeLists.txt | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06ee274..513653a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,6 @@ on: branches: - master pull_request: - schedule: - # run CI every day even if no PRs/merges occur - - cron: '0 12 * * *' env: vcpkg-commit: fd67439f01bfec989f7b1505f3b2f10f771470a3 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f65947d..75b82ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,7 +30,14 @@ target_include_directories( # even when set explicitly as PUBLIC. We set it here so that it works correctly in the install step. set_target_properties("${PROJECT_NAME}" PROPERTIES PUBLIC_HEADER "include/uthenticode.h") -target_link_libraries("${PROJECT_NAME}" PUBLIC pe-parse::pe-parser-library) +# Newer versions of pe-parse use the `pe-parse` target. This check should be removed once the +# releases on vcpkg stabilize. +if (TARGET pe-parse::pe-parse) + target_link_libraries("${PROJECT_NAME}" PUBLIC pe-parse::pe-parse) +else () + target_link_libraries("${PROJECT_NAME}" PUBLIC pe-parse::pe-parser-library) +endif () + target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::Crypto) install(