olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: fix TBB version

This commit is contained in:
Eric Wasylishen 2020-01-29 23:10:06 -07:00
parent a91ee8cc7e
commit 8a468bd6fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appveyor.yml
View File

@ -8,7 +8,7 @@ install:
- ps: 7z x embree64.zip -oc:\
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.15.0/embree-2.15.0.win32.windows.zip' -OutFile 'embree.zip'
- ps: 7z x embree.zip -oc:\
- ps: Invoke-WebRequest 'https://github.com/intel/tbb/releases/download/2017_U7/tbb2017_20170604oss_win.zip' -OutFile 'tbb.zip'
- ps: Invoke-WebRequest 'https://github.com/intel/tbb/releases/download/2017/tbb2017_20160722oss_win.zip' -OutFile 'tbb.zip'
- ps: 7z x tbb.zip -oc:\
build_script:
- ps: >-
@ -19,11 +19,11 @@ build_script:
cd cmakebuild
If ($env:Platform -Match "x64") {
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.15.0.x64.windows" -DTBB_DIR="C:/tbb2017_20170604oss/cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.15.0.x64.windows" -DTBB_DIR="C:/tbb2017_20160722oss/cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
$cmakePlatform = "x64"
} Else {
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.15.0.win32.windows" -DTBB_DIR="C:/tbb2017_20170604oss/cmake" -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013\lib\cmake\Qt5Widgets"
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.15.0.win32.windows" -DTBB_DIR="C:/tbb2017_20160722oss/cmake" -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013\lib\cmake\Qt5Widgets"
$cmakePlatform = "win32"
}