提交 64720f15 编写于 作者: A Alexander Alekhin

doc(windows): update how to handle MSVS 2019

上级 1bfc75ac
...@@ -48,12 +48,12 @@ cd /c/lib ...@@ -48,12 +48,12 @@ cd /c/lib
@code{.bash} @code{.bash}
#!/bin/bash -e #!/bin/bash -e
myRepo=$(pwd) myRepo=$(pwd)
CMAKE_CONFIG_GENERATOR="Visual Studio 14 2015 Win64" CMAKE_GENERATOR_OPTIONS=-G"Visual Studio 16 2019"
#CMAKE_GENERATOR_OPTIONS=-G"Visual Studio 15 2017 Win64"
#CMAKE_GENERATOR_OPTIONS=(-G"Visual Studio 16 2019" -A x64) # CMake 3.14+ is required
if [ ! -d "$myRepo/opencv" ]; then if [ ! -d "$myRepo/opencv" ]; then
echo "cloning opencv" echo "cloning opencv"
git clone https://github.com/opencv/opencv.git git clone https://github.com/opencv/opencv.git
mkdir -p Build/opencv
mkdir -p Install/opencv
else else
cd opencv cd opencv
git pull --rebase git pull --rebase
...@@ -62,16 +62,17 @@ fi ...@@ -62,16 +62,17 @@ fi
if [ ! -d "$myRepo/opencv_contrib" ]; then if [ ! -d "$myRepo/opencv_contrib" ]; then
echo "cloning opencv_contrib" echo "cloning opencv_contrib"
git clone https://github.com/opencv/opencv_contrib.git git clone https://github.com/opencv/opencv_contrib.git
mkdir -p Build/opencv_contrib
else else
cd opencv_contrib cd opencv_contrib
git pull --rebase git pull --rebase
cd .. cd ..
fi fi
RepoSource=opencv RepoSource=opencv
pushd Build/$RepoSource mkdir -p build_opencv
CMAKE_OPTIONS='-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_DOCS:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DINSTALL_CREATE_DISTRIB=ON' pushd build_opencv
cmake -G"$CMAKE_CONFIG_GENERATOR" $CMAKE_OPTIONS -DOPENCV_EXTRA_MODULES_PATH="$myRepo"/opencv_contrib/modules -DCMAKE_INSTALL_PREFIX="$myRepo"/install/"$RepoSource" "$myRepo/$RepoSource" CMAKE_OPTIONS=(-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_DOCS:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DINSTALL_CREATE_DISTRIB=ON)
set -x
cmake "${CMAKE_GENERATOR_OPTIONS[@]}" "${CMAKE_OPTIONS[@]}" -DOPENCV_EXTRA_MODULES_PATH="$myRepo"/opencv_contrib/modules -DCMAKE_INSTALL_PREFIX="$myRepo/install/$RepoSource" "$myRepo/$RepoSource"
echo "************************* $Source_DIR -->debug" echo "************************* $Source_DIR -->debug"
cmake --build . --config debug cmake --build . --config debug
echo "************************* $Source_DIR -->release" echo "************************* $Source_DIR -->release"
...@@ -82,15 +83,15 @@ popd ...@@ -82,15 +83,15 @@ popd
@endcode @endcode
In this script I suppose you use VS 2015 in 64 bits In this script I suppose you use VS 2015 in 64 bits
@code{.bash} @code{.bash}
CMAKE_CONFIG_GENERATOR="Visual Studio 14 2015 Win64" CMAKE_GENERATOR_OPTIONS=-G"Visual Studio 14 2015 Win64"
@endcode @endcode
and opencv will be installed in c:/lib/install and opencv will be installed in c:/lib/install/opencv
@code{.bash} @code{.bash}
-DCMAKE_INSTALL_PREFIX="$myRepo"/install/"$RepoSource" "$myRepo/$RepoSource" -DCMAKE_INSTALL_PREFIX="$myRepo/install/$RepoSource"
@endcode @endcode
with no Perf tests, no tests, no doc, no CUDA and no example with no Perf tests, no tests, no doc, no CUDA and no example
@code{.bash} @code{.bash}
CMAKE_OPTIONS='-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_DOCS:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF' CMAKE_OPTIONS=(-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_DOCS:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF)
@endcode @endcode
-# In git command line enter following command : -# In git command line enter following command :
@code{.bash} @code{.bash}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册