Skip to content
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.

Sign up for GitHub

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

AppVeyor: Build with Visual Studio 2017, cleanup #775

Closed
wants to merge 9 commits into from
Closed

AppVeyor: Build with Visual Studio 2017, cleanup #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5fbee18
AppVeyor: Move to VS 2019
EwoutH Apr 29, 2020
7ebafd8
AppVeyor: Cleanup
EwoutH Apr 29, 2020
449148a
cudaInstallAppveyor.cmd: Update OS platform for AppVeyor
EwoutH Apr 30, 2020
1160439
AppVeyor: Update Cuda triplet to win10
EwoutH Apr 30, 2020
cd59ef4
AppVeyor: Now really use correct Cuda triplet
EwoutH Apr 30, 2020
8ac6773
AppVeyor: Specify CMake architecture (x64)
EwoutH Apr 30, 2020
832dc3d
AppVeyor: Use Visual Studio 2017
EwoutH Apr 30, 2020
33172c8
cudaInstallAppveyor.cmd: Update CUDA 9.2 patch level from 88 to 148 (…
EwoutH May 11, 2020
6207339
cudaInstallAppveyor.cmd: Update CUDA toolkit URL
EwoutH May 11, 2020
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
18 changes: 5 additions & 13 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
version: '1.0.{build}'

image: Visual Studio 2015
image: Visual Studio 2017
configuration: Release

branches:
only:
- master
- develop # PRs are built

platform:
- x64

# environment:
# APPVEYOR_SAVE_CACHE_ON_ERROR: true

configuration:
- Release
# - Debug

install:
- git submodule update --init --recursive
- cmd: >-
Expand All @@ -36,15 +28,15 @@ install:
eigen3
ceres[suitesparse]
cuda
--triplet %PLATFORM%-windows
--triplet x64-windows
--recurse
- vcpkg list

before_build:
- cd %APPVEYOR_BUILD_FOLDER%
- md build
- cd build
- cmake .. -G "Visual Studio 14 2015 Win64"
- cmake .. -A x64
-DCMAKE_BUILD_TYPE=%CONFIGURATION%
-DALICEVISION_USE_INTERNAL_CERES:BOOL=OFF
-DALICEVISION_USE_CUDA:BOOL=ON
Expand All @@ -53,7 +45,7 @@ before_build:
- ls -l

build:
project: $(APPVEYOR_BUILD_FOLDER)\build\aliceVision.sln
project: build\aliceVision.sln
verbosity: minimal

#comment the above and uncomment the following to just build the dependencies
Expand Down
6 changes: 3 additions & 3 deletions cudaInstallAppveyor.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

set CUDA_VERSION_MAJOR=9
set CUDA_VERSION_MINOR=2
set CUDA_VERSION_MICRO=88
set OS_PLATFORM=windows
set CUDA_VERSION_MICRO=148
set OS_PLATFORM=win10

set CUDA_VERSION=%CUDA_VERSION_MAJOR%.%CUDA_VERSION_MINOR%
set CUDA_VERSION_FULL=%CUDA_VERSION%.%CUDA_VERSION_MICRO%
set CUDA_SDK_FILENAME=cuda_%CUDA_VERSION_FULL%_%OS_PLATFORM%
set CUDA_SDK_URL=https://developer.nvidia.com/compute/cuda/%CUDA_VERSION%/Prod/local_installers/%CUDA_SDK_FILENAME%
set CUDA_SDK_URL=https://developer.nvidia.com/compute/cuda/%CUDA_VERSION%/Prod2/local_installers2/%CUDA_SDK_FILENAME%

echo Downloading CUDA toolkit %CUDA_VERSION_FULL%
echo -- url: %CUDA_SDK_URL%
Expand Down