Skip to content
Snippets Groups Projects
Commit d491eb65 authored by calrama's avatar calrama
Browse files

windows1809: Update OpenCV to 4

parent ea2d1081
No related branches found
No related tags found
No related merge requests found
Pipeline #26646 passed
Stage: build
Stage: deploy
Pipeline: behavior_loader

#26649

    Pipeline: interfaces

    #26648

      Hide whitespace changes
      Inline Side-by-side
      windows1809/base/Dockerfile
      + 1
      − 1
      View file @ d491eb65
      ...@@ -45,6 +45,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl ...@@ -45,6 +45,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
      RUN $vcpkg_dir = 'C:/vcpkg'; \ RUN $vcpkg_dir = 'C:/vcpkg'; \
      git clone https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \ git clone https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \
      cd $vcpkg_dir; \ cd $vcpkg_dir; \
      git checkout ed03d814da4c8edf09caba90c15741f13f436f9e; \ git checkout 7d322e995f49d3989fa982268c2d4586c4f8d1f1; \
      ./scripts/bootstrap.ps1; \ ./scripts/bootstrap.ps1; \
      [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
      windows1809/cuda-devel/Dockerfile
      + 1
      − 1
      View file @ d491eb65
      ...@@ -34,7 +34,7 @@ RUN cd $env:VCPKG_DIR; \ ...@@ -34,7 +34,7 @@ RUN cd $env:VCPKG_DIR; \
      harfbuzz \ harfbuzz \
      rpclib \ rpclib \
      eigen3 \ eigen3 \
      "\"opencv3[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ "\"opencv4[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
      "\"mxnet[cpp,opencv,cuda,cudnn]\""; \ "\"mxnet[cpp,opencv,cuda,cudnn]\""; \
      [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
      [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
      ......
      windows1809/devel/Dockerfile
      + 1
      − 1
      View file @ d491eb65
      ...@@ -23,7 +23,7 @@ RUN cd $env:VCPKG_DIR; \ ...@@ -23,7 +23,7 @@ RUN cd $env:VCPKG_DIR; \
      harfbuzz \ harfbuzz \
      rpclib \ rpclib \
      eigen3 \ eigen3 \
      "\"opencv3[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ "\"opencv4[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \
      "\"mxnet[cpp,opencv]\""; \ "\"mxnet[cpp,opencv]\""; \
      [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
      [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Please register or to comment