Skip to content

Commit

Permalink
chore: build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ronald Holshausen committed Jan 12, 2021
1 parent 08d45ce commit c4507f0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/consumer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
conan profile new default --detect
conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
conan remote add pact-foundation https://api.bintray.com/conan/pact-foundation/conan
conan profile update settings.compiler.cppstd=14 default
conan profile update settings.compiler.cppstd=17 default
conan install .. --build missing
working-directory: consumer/build
- name: Build library
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
conan profile new default --detect
conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
conan remote add pact-foundation https://api.bintray.com/conan/pact-foundation/conan
conan profile update settings.compiler.cppstd=14 default
conan profile update settings.compiler.cppstd=17 default
conan install .. --build missing
working-directory: consumer/build
- name: Build conan package
Expand Down
2 changes: 1 addition & 1 deletion consumer/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ conan_basic_setup()

add_executable(example example.cpp)
if(WIN32)
TARGET_LINK_LIBRARIES(example ${CONAN_LIBS} ws2_32 userenv crypt32 secur32 dnsapi ncrypt)
TARGET_LINK_LIBRARIES(example ${CONAN_LIBS} ws2_32 userenv crypt32 secur32 dnsapi ncrypt ntdll)
elseif(UNIX) # LINUX or APPLE
TARGET_LINK_LIBRARIES(example ${CONAN_LIBS})
endif()
Expand Down

0 comments on commit c4507f0

Please sign in to comment.