Skip to content

Commit

Permalink
use system cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Lars Berscheid committed Jul 16, 2021
1 parent 0203fd9 commit 69592ae
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/install-base.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Install OpenCV
git clone https://github.com/opencv/opencv.git
cd opencv
git checkout 4.5.2
mkdir build && cd build
cmake -DWITH_VTK=OFF -DWITH_GTK=OFF -DWITH_PROTOBUF=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DWITH_WEBP=OFF ..
make -j2
make install
cd ../../
# # Install OpenCV
# git clone https://github.com/opencv/opencv.git
# cd opencv
# git checkout 4.5.2
# mkdir build && cd build
# cmake -DWITH_VTK=OFF -DWITH_GTK=OFF -DWITH_PROTOBUF=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DWITH_WEBP=OFF ..
# make -j2
# make install
# cd ../../

# Install PyBind11
git clone https://github.com/pybind/pybind11.git
cd pybind11
git checkout v2.6.2
mkdir build && cd build
cmake -DPYBIND11_TEST=OFF ..
make -j2
make install
cd ../../
# # Install PyBind11
# git clone https://github.com/pybind/pybind11.git
# cd pybind11
# git checkout v2.6.2
# mkdir build && cd build
# cmake -DPYBIND11_TEST=OFF ..
# make -j2
# make install
# cd ../../
3 changes: 1 addition & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
uses: RalfG/python-wheels-manylinux-build@v0.3.4
with:
python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39'
build-requirements: 'cmake'
system-packages: 'mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel mesa-libEGL mesa-libEGL-devel glew glew-devel eigen3-devel'
system-packages: 'cmake mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel mesa-libEGL mesa-libEGL-devel glew glew-devel eigen3-devel'
pre-build-command: 'sh .github/workflows/install-base.sh'

- name: Build and publish
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.12)
project(griffig VERSION 0.0.1 LANGUAGES CXX)


find_package(OpenCV REQUIRED COMPONENTS core imgproc)
find_package(OpenGL REQUIRED COMPONENTS OpenGL EGL)
find_package(GLEW REQUIRED)
find_package(OpenCV REQUIRED COMPONENTS core imgproc)
find_package(pybind11 2.6 REQUIRED)


Expand Down

0 comments on commit 69592ae

Please sign in to comment.