Skip to content

Commit b94b913

Browse files
committed
Im cooked chat
1 parent 93767bb commit b94b913

3 files changed

Lines changed: 11 additions & 29 deletions

File tree

.github/workflows/cmake-multi-platform.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [ubuntu-latest, windows-latest]
16+
os: [ubuntu-latest]
1717
build_type: [Debug, Release]
1818

1919
steps:
@@ -32,25 +32,12 @@ jobs:
3232
sudo apt-get update
3333
sudo apt-get install -y pkg-config libopencv-dev libeigen3-dev libopenexr-dev
3434
35-
# Windows Dependencies
36-
- name: Install Dependencies (Windows)
37-
if: runner.os == 'Windows'
38-
shell: pwsh
39-
run: |
40-
choco install opencv
41-
choco install eigen
42-
4335
# Configure
4436
- name: Configure with CMake
4537
run: |
46-
if [[ "$RUNNER_OS" == "Linux" ]]; then
47-
cmake -B build -S $GITHUB_WORKSPACE \
48-
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
49-
-DOpenCV_DIR=/usr/lib/x86_64-linux-gnu/cmake/opencv4
50-
else
51-
cmake -B build -S $GITHUB_WORKSPACE \
52-
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
53-
fi
38+
cmake -B build -S $GITHUB_WORKSPACE \
39+
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
40+
-DOpenCV_DIR=/usr/lib/x86_64-linux-gnu/cmake/opencv4
5441
5542
# Build
5643
- name: Build

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,13 @@ set(CPACK_SOURCE_IGNORE_FILES "/\.git*;/build;")
4444
include(CPack)
4545

4646
# -------- Dependencies --------
47-
find_package(OpenCV REQUIRED)
48-
find_package(Eigen3 REQUIRED NO_MODULES)
47+
find_package(PkgConfig REQUIRED)
48+
49+
# Use PkgConfig for OpenCV
50+
pkg_check_modules(OPENCV REQUIRED opencv4)
51+
52+
# Use PkgConfig for Eigen
53+
pkg_check_modules(EIGEN3 REQUIRED eigen3)
4954

5055
# (Optional) OpenEXR via find_package
5156
find_package(OpenEXR QUIET)

vcpkg.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)