Skip to content

Commit fa66514

Browse files
committed
Merge pull request opencv#19104 from alalek:docs_cmake_msvs2019
2 parents 9b4adc9 + 64720f1 commit fa66514

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

doc/tutorials/introduction/windows_install/windows_install.markdown

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ cd /c/lib
4848
@code{.bash}
4949
#!/bin/bash -e
5050
myRepo=$(pwd)
51-
CMAKE_CONFIG_GENERATOR="Visual Studio 14 2015 Win64"
51+
CMAKE_GENERATOR_OPTIONS=-G"Visual Studio 16 2019"
52+
#CMAKE_GENERATOR_OPTIONS=-G"Visual Studio 15 2017 Win64"
53+
#CMAKE_GENERATOR_OPTIONS=(-G"Visual Studio 16 2019" -A x64) # CMake 3.14+ is required
5254
if [ ! -d "$myRepo/opencv" ]; then
5355
echo "cloning opencv"
5456
git clone https://github.com/opencv/opencv.git
55-
mkdir -p Build/opencv
56-
mkdir -p Install/opencv
5757
else
5858
cd opencv
5959
git pull --rebase
@@ -62,16 +62,17 @@ fi
6262
if [ ! -d "$myRepo/opencv_contrib" ]; then
6363
echo "cloning opencv_contrib"
6464
git clone https://github.com/opencv/opencv_contrib.git
65-
mkdir -p Build/opencv_contrib
6665
else
6766
cd opencv_contrib
6867
git pull --rebase
6968
cd ..
7069
fi
7170
RepoSource=opencv
72-
pushd Build/$RepoSource
73-
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'
74-
cmake -G"$CMAKE_CONFIG_GENERATOR" $CMAKE_OPTIONS -DOPENCV_EXTRA_MODULES_PATH="$myRepo"/opencv_contrib/modules -DCMAKE_INSTALL_PREFIX="$myRepo"/install/"$RepoSource" "$myRepo/$RepoSource"
71+
mkdir -p build_opencv
72+
pushd build_opencv
73+
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)
74+
set -x
75+
cmake "${CMAKE_GENERATOR_OPTIONS[@]}" "${CMAKE_OPTIONS[@]}" -DOPENCV_EXTRA_MODULES_PATH="$myRepo"/opencv_contrib/modules -DCMAKE_INSTALL_PREFIX="$myRepo/install/$RepoSource" "$myRepo/$RepoSource"
7576
echo "************************* $Source_DIR -->debug"
7677
cmake --build . --config debug
7778
echo "************************* $Source_DIR -->release"
@@ -82,15 +83,15 @@ popd
8283
@endcode
8384
In this script I suppose you use VS 2015 in 64 bits
8485
@code{.bash}
85-
CMAKE_CONFIG_GENERATOR="Visual Studio 14 2015 Win64"
86+
CMAKE_GENERATOR_OPTIONS=-G"Visual Studio 14 2015 Win64"
8687
@endcode
87-
and opencv will be installed in c:/lib/install
88+
and opencv will be installed in c:/lib/install/opencv
8889
@code{.bash}
89-
-DCMAKE_INSTALL_PREFIX="$myRepo"/install/"$RepoSource" "$myRepo/$RepoSource"
90+
-DCMAKE_INSTALL_PREFIX="$myRepo/install/$RepoSource"
9091
@endcode
9192
with no Perf tests, no tests, no doc, no CUDA and no example
9293
@code{.bash}
93-
CMAKE_OPTIONS='-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_DOCS:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF'
94+
CMAKE_OPTIONS=(-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_DOCS:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF)
9495
@endcode
9596
-# In git command line enter following command :
9697
@code{.bash}

0 commit comments

Comments
 (0)