提交 b4983f6d 编写于 作者: O Olli-Pekka Heinisuo

change variable to from true/false to 1/0

上级 27ef35fb
......@@ -10,83 +10,83 @@ environment:
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "2.7"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python27-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "2.7"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python34"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.4"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python34-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.4"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python35"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.5"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python35-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.5"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python36"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.6"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python36-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.6"
ENABLE_CONTRIB: false
ENABLE_CONTRIB: 0
- PYTHON: "C:/Python27"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "2.7"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python27-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "2.7"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python34"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.4"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python34-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.4"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python35"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.5"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python35-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.5"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python36"
BUILD_ENV: "Visual Studio 14"
BUILD_DIR: "build"
PYTHON_VERSION: "3.6"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
- PYTHON: "C:/Python36-x64"
BUILD_ENV: "Visual Studio 14 Win64"
BUILD_DIR: "build64"
PYTHON_VERSION: "3.6"
ENABLE_CONTRIB: true
ENABLE_CONTRIB: 1
install:
- cmd: >-
......@@ -106,7 +106,7 @@ build_script:
cd opencv
if %ENABLE_CONTRIB% EQU true (
if %ENABLE_CONTRIB% EQU 1 (
if %PYTHON_VERSION% GEQ 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DPYTHON3_EXECUTABLE="%PYTHON%/python.exe" -DPYTHON3_LIBRARY="%PYTHON%/libs/python3*.lib" -DPYTHON3_INCLUDE_DIR="%PYTHON%/include" -Wno-dev
if %PYTHON_VERSION% LSS 3 cmake -G "%BUILD_ENV%" -H"." -B"%BUILD_DIR%" -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -Wno-dev
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册