Skip to content

Move eigen dl version to single file, update to 3.3.2 #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ install:
conda install -y -q pytest numpy scipy
}
- ps: |
Start-FileDownload 'http://bitbucket.org/eigen/eigen/get/3.3.0.zip'
7z x 3.3.0.zip -y > $null
$env:CMAKE_INCLUDE_PATH = "eigen-eigen-26667be4f70b"
$eigen = Get-Content -head 2 .eigen-build-version
Start-FileDownload "http://bitbucket.org/eigen/eigen/get/$($eigen[0]).zip"
7z x "$($eigen[0]).zip" -y > $null
$env:CMAKE_INCLUDE_PATH = $eigen[1]
build_script:
- cmake -A "%CMAKE_ARCH%" -DPYBIND11_WERROR=ON
- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
Expand Down
5 changes: 5 additions & 0 deletions .eigen-build-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
3.3.2
eigen-eigen-da9b4e14c255
# This is the version and extracted directory used for appveyor and travis-ci
# builds. The first line is the eigen version to download, the second is the
# extracted directory name. These comments must stay after the first two lines.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ install:
else
pip install numpy scipy pytest

wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.3.0.tar.gz
tar xzf eigen.tar.gz
export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DCMAKE_INCLUDE_PATH=$PWD/eigen-eigen-26667be4f70b"
eigen=($(head -n 2 .eigen-build-version))
curl https://bitbucket.org/eigen/eigen/get/${eigen[0]}.tar.bz2 | tar xj
export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DCMAKE_INCLUDE_PATH=$PWD/${eigen[1]}"
fi
script:
- $SCRIPT_RUN_PREFIX cmake ${CMAKE_EXTRA_ARGS}
Expand Down