File tree Expand file tree Collapse file tree 2 files changed +7
-12
lines changed Expand file tree Collapse file tree 2 files changed +7
-12
lines changed Original file line number Diff line number Diff line change @@ -114,18 +114,13 @@ jobs:
114114 uses : lukka/run-vcpkg@v2
115115 with :
116116 vcpkgGitCommitId : ${{ env.vcpkg-commit }}
117- vcpkgArguments : ${{ env.vcpkg-install }}
118-
119- - name : deps
120- run : |
121- brew install openssl
117+ vcpkgArguments : ${{ env.vcpkg-install }} openssl
122118
123119 - name : configure
124120 run : |
125121 mkdir build && cd build
126122 cmake \
127123 -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \
128- -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 \
129124 -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
130125 -DBUILD_SHARED_LIBS=${{ matrix.build-shared.flag }} \
131126 -DBUILD_SVCLI=1 \
Original file line number Diff line number Diff line change @@ -12,11 +12,11 @@ add_library("${PROJECT_NAME}" uthenticode.cpp)
1212
1313if ("${CMAKE_BUILD_TYPE} " STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE} " STREQUAL "RelWithDebInfo" )
1414 if (MSVC )
15- target_compile_options ("${PROJECT_NAME} " PUBLIC /W4 /WX)
15+ target_compile_options ("${PROJECT_NAME} " INTERFACE /W4 /WX)
1616 else ()
17- target_compile_options ("${PROJECT_NAME} " PUBLIC -Wall -Wextra -pedantic -Werror)
18- target_compile_options ("${PROJECT_NAME} " PUBLIC -fsanitize=address)
19- target_link_options ("${PROJECT_NAME} " PUBLIC -fsanitize=address)
17+ target_compile_options ("${PROJECT_NAME} " INTERFACE -Wall -Wextra -pedantic -Werror)
18+ target_compile_options ("${PROJECT_NAME} " INTERFACE -fsanitize=address)
19+ target_link_libraries ("${PROJECT_NAME} " INTERFACE -fsanitize=address)
2020 endif ()
2121endif ()
2222
@@ -29,8 +29,8 @@ target_include_directories(
2929# even when set explicitly as PUBLIC. We set it here so that it works correctly in the install step.
3030set_target_properties ("${PROJECT_NAME} " PROPERTIES PUBLIC_HEADER "include/uthenticode.h" )
3131
32- target_link_libraries ("${PROJECT_NAME} " pe-parse::pe-parser-library)
33- target_link_libraries ("${PROJECT_NAME} " OpenSSL::Crypto )
32+ target_link_libraries ("${PROJECT_NAME} " PUBLIC pe-parse::pe-parser-library)
33+ target_link_libraries ("${PROJECT_NAME} " PRIVATE " ${OPENSSL_CRYPTO_LIBRARY} " )
3434
3535install (
3636 TARGETS "${PROJECT_NAME} "
You can’t perform that action at this time.
0 commit comments