Skip to content

Commit 39b8965

Browse files
authored
Merge pull request #608 from jschueller/eigen5x
CMake: Eigen 5.x compat
2 parents bd9c91e + fbe3205 commit 39b8965

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- name: Build
1515
run: bash tools/gha_osx.sh
16-
windows-2019:
17-
runs-on: windows-2019
16+
windows:
17+
runs-on: windows-2022
1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Add msbuild to PATH

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ endif()
179179

180180
# Eigen3
181181
if(PAGMO_WITH_EIGEN3)
182-
find_package(Eigen3 3.3 REQUIRED NO_MODULE)
182+
find_package(Eigen3 REQUIRED NO_MODULE)
183183
endif()
184184

185185
# NLopt
@@ -470,7 +470,7 @@ install(TARGETS pagmo
470470
# Setup of the optional deps.
471471
set(_PAGMO_CONFIG_OPTIONAL_DEPS)
472472
if(PAGMO_WITH_EIGEN3)
473-
set(_PAGMO_CONFIG_OPTIONAL_DEPS "${_PAGMO_CONFIG_OPTIONAL_DEPS}find_package(Eigen3 3.3 QUIET REQUIRED NO_MODULE)\n")
473+
set(_PAGMO_CONFIG_OPTIONAL_DEPS "${_PAGMO_CONFIG_OPTIONAL_DEPS}find_package(Eigen3 QUIET REQUIRED NO_MODULE)\n")
474474
endif()
475475
if(PAGMO_WITH_NLOPT)
476476
set(_PAGMO_CONFIG_OPTIONAL_DEPS "${_PAGMO_CONFIG_OPTIONAL_DEPS}find_package(NLopt 2.6 QUIET REQUIRED NO_MODULE)\n")

doc/sphinx/conf.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,4 +384,4 @@ texinfo_documents = [
384384
linkcheck_workers = 1
385385

386386
# those can fail on remote CI
387-
linkcheck_ignore = [r'https://www.sciencedirect.com/*', r'https://ieeexplore.ieee.org/*']
387+
linkcheck_ignore = [r'https://www.sciencedirect.com/*', r'https://ieeexplore.ieee.org/*', r'http://hdl.handle.net/*']

tools/gha_windows-2019.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mkdir build
88
cd build
99

1010
cmake `
11-
-G "Visual Studio 16 2019" `
11+
-G "Visual Studio 17 2022" `
1212
-A x64 `
1313
-DCMAKE_PREFIX_PATH=C:\Miniconda\envs\pagmo `
1414
-DCMAKE_INSTALL_PREFIX=C:\Miniconda\envs\pagmo `

0 commit comments

Comments
 (0)