test

apache · Apr 3, 2020 · 89e34bb · 89e34bb
1 parent a348cfd
commit 89e34bb
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/ci/build_windows.py b/ci/build_windows.py
@@ -37,11 +37,6 @@
 
 from util import *
 
-
-# Fix for broken PATH with newline inserted presumably by VS studio installation of SQL server or
-# other component which makes visual studio stop working.
-os.environ['PATH']=os.environ.get('PATH').replace('\n','')
-
 KNOWN_VCVARS = {
     # https://gitlab.kitware.com/cmake/cmake/issues/18920
     'VS 2015': r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat',
@@ -67,8 +62,6 @@ class BuildFlavour(Enum):
         '-DUSE_CUDNN=OFF '
         '-DENABLE_CUDA_RTC=OFF '
         '-DUSE_OPENCV=ON '
-        '-DOpenCV_RUNTIME=vc15 '
-        '-DOpenCV_ARCH=x64 '
         '-DUSE_OPENMP=ON '
         '-DUSE_BLAS=open '
         '-DUSE_LAPACK=ON '
@@ -84,8 +77,6 @@ class BuildFlavour(Enum):
         '-DUSE_CUDNN=OFF '
         '-DENABLE_CUDA_RTC=OFF '
         '-DUSE_OPENCV=ON '
-        '-DOpenCV_RUNTIME=vc15 '
-        '-DOpenCV_ARCH=x64 '
         '-DUSE_OPENMP=ON '
         '-DUSE_BLAS=open '
         '-DUSE_LAPACK=ON '
@@ -101,8 +92,6 @@ class BuildFlavour(Enum):
         '-DUSE_CUDNN=OFF '
         '-DENABLE_CUDA_RTC=OFF '
         '-DUSE_OPENCV=ON '
-        '-DOpenCV_RUNTIME=vc15 '
-        '-DOpenCV_ARCH=x64 '
         '-DUSE_OPENMP=ON '
         '-DUSE_BLAS=mkl '
         '-DUSE_LAPACK=ON '
@@ -118,8 +107,6 @@ class BuildFlavour(Enum):
         '-DUSE_CUDNN=OFF '
         '-DENABLE_CUDA_RTC=OFF '
         '-DUSE_OPENCV=ON '
-        '-DOpenCV_RUNTIME=vc15 '
-        '-DOpenCV_ARCH=x64 '
         '-DUSE_OPENMP=ON '
         '-DUSE_BLAS=mkl '
         '-DUSE_LAPACK=ON '
@@ -135,8 +122,6 @@ class BuildFlavour(Enum):
         '-DUSE_CUDNN=ON '
         '-DENABLE_CUDA_RTC=ON '
         '-DUSE_OPENCV=ON  '
-        '-DOpenCV_RUNTIME=vc15 '
-        '-DOpenCV_ARCH=x64 '
         '-DUSE_OPENMP=ON '
         '-DUSE_BLAS=open '
         '-DUSE_LAPACK=ON '
@@ -153,8 +138,6 @@ class BuildFlavour(Enum):
         '-DUSE_CUDNN=ON '
         '-DENABLE_CUDA_RTC=ON '
         '-DUSE_OPENCV=ON '
-        '-DOpenCV_RUNTIME=vc15 '
-        '-DOpenCV_ARCH=x64 '
         '-DUSE_OPENMP=ON '
         '-DUSE_BLAS=open '
         '-DUSE_LAPACK=ON '