Skip to content
This repository was archived by the owner on May 16, 2024. It is now read-only.

Commit ccb84b1

Browse files
metsmamrts
authored andcommitted
pkg-config is required on linux
IB-7275 Signed-off-by: Raul Metsma <[email protected]>
1 parent 8092e1c commit ccb84b1

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

.github/workflows/cmake-windows.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ jobs:
2121
vcpkgArguments: gtest:x64-windows
2222
vcpkgTriplet: x64-windows
2323
vcpkgDirectory: ${{runner.workspace}}/vcpkg/
24-
vcpkgGitCommitId: ec6fe06e8da05a8157dc8581fa96b36b571c1bd5
25-
26-
- name: Create build directory
27-
run: mkdir build
24+
vcpkgGitCommitId: 9b064ff07b987c8f213fdbf4358122fd4fe38ef1
2825

2926
- name: Configure CMake
30-
working-directory: ${{github.workspace}}/build
31-
run: cmake -A x64 "-DCMAKE_TOOLCHAIN_FILE=${{runner.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" ..
27+
run: cmake -A x64 "-DCMAKE_TOOLCHAIN_FILE=${{runner.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" -B build -S .
3228

3329
- name: Build
34-
working-directory: ${{github.workspace}}/build
35-
run: cmake --build . --config ${env:BUILD_TYPE}
30+
run: cmake --build build --config ${env:BUILD_TYPE}
3631

3732
- name: Test
38-
working-directory: ${{github.workspace}}/build
39-
run: ctest -V -C ${env:BUILD_TYPE}
33+
run: ctest -V -C ${env:BUILD_TYPE} --test-dir build

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ elseif(APPLE)
5555
# no extra includes required
5656
target_link_libraries(pcsc INTERFACE "-framework PCSC")
5757
else()
58-
find_package(PkgConfig)
59-
pkg_check_modules(PCSC libpcsclite)
58+
find_package(PkgConfig REQUIRED)
59+
pkg_check_modules(PCSC libpcsclite REQUIRED)
6060
target_include_directories(${PROJECT_NAME} PRIVATE ${PCSC_INCLUDE_DIRS})
6161
target_link_libraries(pcsc INTERFACE ${PCSC_LIBRARIES})
6262
endif()

0 commit comments

Comments
 (0)