CI, build fixups (#46)

trailofbits · May 25, 2021 · 887e05f · 887e05f
1 parent 10c478e
commit 887e05f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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(