Skip to content

Commit 4336177

Browse files
committed
change the default settings for windows build
1 parent 58656c0 commit 4336177

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

scripts/build_win.cmd

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if DEFINED APPVEYOR (
1111
if NOT DEFINED CMAKE_CONFIG set CMAKE_CONFIG=Release
1212
if NOT DEFINED USE_NCCL set USE_NCCL=0
1313
if NOT DEFINED CMAKE_BUILD_SHARED_LIBS set CMAKE_BUILD_SHARED_LIBS=0
14-
:: Change to 3/3.5 if using python 3.5, change to 3.6 if using python 3.6 (only 2.7 and 3.5/3.6 are supported)
15-
if NOT DEFINED PYTHON_VERSION set PYTHON_VERSION=2
14+
:: Change to 2/2.7 if using python 2.7, Change to 3/3.5 if using python 3.5, change to 3.6 if using python 3.6 (only 2.7 and 3.5/3.6 are supported)
15+
if NOT DEFINED PYTHON_VERSION set PYTHON_VERSION=3.6
1616
if NOT DEFINED BUILD_PYTHON set BUILD_PYTHON=1
1717
if NOT DEFINED BUILD_PYTHON_LAYER set BUILD_PYTHON_LAYER=1
1818
if NOT DEFINED BUILD_MATLAB set BUILD_MATLAB=0
@@ -25,6 +25,9 @@ if DEFINED APPVEYOR (
2525
if !PYTHON_VERSION! EQU 2 (
2626
set CONDA_ROOT=C:\Miniconda-x64
2727
)
28+
if !PYTHON_VERSION! EQU 2.7 (
29+
set CONDA_ROOT=C:\Miniconda-x64
30+
)
2831
:: Set python 3.6 with conda as the default python
2932
if !PYTHON_VERSION! EQU 3.6 (
3033
set CONDA_ROOT=C:\Miniconda36-x64
@@ -91,8 +94,8 @@ if DEFINED APPVEYOR (
9194
if NOT DEFINED USE_NCCL set USE_NCCL=0
9295
:: Change to 1 to build a caffe.dll
9396
if NOT DEFINED CMAKE_BUILD_SHARED_LIBS set CMAKE_BUILD_SHARED_LIBS=0
94-
:: Change to 3 if using python 3.5/3.6 (only 2.7 and 3.5/3.6 are supported)
95-
if NOT DEFINED PYTHON_VERSION set PYTHON_VERSION=2
97+
:: Change to 2 if using python 2.7, Change to 3 if using python 3.5/3.6 (only 2.7 and 3.5/3.6 are supported)
98+
if NOT DEFINED PYTHON_VERSION set PYTHON_VERSION=3.6
9699
:: Change these options for your needs.
97100
if NOT DEFINED BUILD_PYTHON set BUILD_PYTHON=1
98101
if NOT DEFINED BUILD_PYTHON_LAYER set BUILD_PYTHON_LAYER=1

0 commit comments

Comments
 (0)