Skip to content

Commit 6c92a5a

Browse files
committed
Fix CI builds with Eigen 3 and C++14
1 parent 54a4b00 commit 6c92a5a

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ jobs:
4646
uses: pypa/cibuildwheel@v2.21
4747
env:
4848
CIBW_BUILD: cp310-macosx* cp311-macosx* cp312-macosx*
49-
CIBW_BEFORE_ALL_MACOS: brew install eigen
49+
CIBW_ENVIRONMENT_MACOS: CMAKE_INCLUDE_PATH=/tmp/eigen3
50+
CIBW_BEFORE_ALL_MACOS: python -c "import pathlib, shutil, tarfile, tempfile, urllib.request; url='https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz'; tmp=tempfile.mkdtemp(); archive=pathlib.Path(tmp)/'eigen.tar.gz'; archive.write_bytes(urllib.request.urlopen(url).read()); src_root=pathlib.Path(tmp)/'src'; src_root.mkdir(); tarfile.open(archive).extractall(src_root); src=next(src_root.glob('eigen-*')); dst=pathlib.Path('/tmp/eigen3'); shutil.rmtree(dst, ignore_errors=True); shutil.copytree(src, dst)"
5051
with:
5152
platform: macos
5253
python-version: ${{ env.MAIN_TEST_PYTHON }}

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
cmake_minimum_required(VERSION 3.15)
22
project("LabelLib")
33

4-
set(CMAKE_CXX_STANDARD 11)
4+
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6+
set(CMAKE_CXX_EXTENSIONS OFF)
57
if(MSVC)
6-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")
8+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
79
if(BIT MATCHES "64")
810
add_definitions(-DMS_WIN64)
911
endif(BIT MATCHES "64")

recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ requirements:
2424
- cmake
2525
- ninja
2626
- pybind11
27-
- eigen
27+
- eigen 3.4.*
2828
- numpy
2929
run:
3030
- python

0 commit comments

Comments
 (0)