Skip to content

Commit 992d033

Browse files
author
Clement Champetier
committed
Appveyor: added common environment variables
1 parent ae75cd6 commit 992d033

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ platform:
77

88
environment:
99
FFMPEG_VERSION: 2.4.5
10+
DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5
11+
AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install
1012

1113
matrix:
1214
fast_finish: true

tools/appveyor/build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MKDIR build
44
cd build
55

66
:: Configure
7-
call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CD% -DCMAKE_PREFIX_PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
7+
call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%%AVTRANSCODER_INSTALL_PATH%% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
88

99
:: Build & Install
1010
call nmake /F Makefile

tools/appveyor/python.nosetests.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
set PWD=C:\projects\avtranscoder
44

55
:: Get avtranscoder library
6-
set PYTHONPATH=%PWD%\build\lib\python2.7\site-packages;%PYTHONPATH%
7-
set PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%\bin;%PWD%\build\lib;%PATH%
6+
set PYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python2.7\site-packages;%PYTHONPATH%
7+
set PATH=%DEPENDENCY_INSTALL_PATH%\bin;%AVTRANSCODER_INSTALL_PATH%\lib;%PATH%
88

99
:: Get avtranscoder profiles
10-
set AVPROFILES=%PWD%\build\share\avprofiles
10+
set AVPROFILES=%AVTRANSCODER_INSTALL_PATH%\share\avprofiles
1111

1212
:: Get assets
1313
git clone https://github.com/avTranscoder/avTranscoder-data.git

0 commit comments

Comments
 (0)