Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1

This commit is contained in:
Alexander Alekhin 2020-06-12 06:58:14 +00:00
commit 0c8da03869

View File

@ -30,7 +30,7 @@ Installing CMake
-# Install the dmg package and launch it from Applications. That will give you the UI app of CMake -# Install the dmg package and launch it from Applications. That will give you the UI app of CMake
-# From the CMake app window, choose menu Tools --> Install For Command Line Use. -# From the CMake app window, choose menu Tools --> How to Install For Command Line Use. Then, follow the instructions from the pop-up there.
-# Install folder will be /usr/bin/ by default, submit it by choosing Install command line links. -# Install folder will be /usr/bin/ by default, submit it by choosing Install command line links.
@ -66,7 +66,7 @@ git clone https://github.com/opencv/opencv_contrib.git
Building OpenCV from Source Using CMake Building OpenCV from Source Using CMake
--------------------------------------- ---------------------------------------
-# Create a temporary directory, which we denote as `<cmake_build_dir>`, where you want to put -# Create a temporary directory, which we denote as `build_opencv`, where you want to put
the generated Makefiles, project files as well the object files and output binaries and enter the generated Makefiles, project files as well the object files and output binaries and enter
there. there.
@ -87,8 +87,8 @@ Building OpenCV from Source Using CMake
or cmake-gui or cmake-gui
- set full path to OpenCV source code, e.g. `/home/user/opencv` - set the OpenCV source code path to, e.g. `/home/user/opencv`
- set full path to `<cmake_build_dir>`, e.g. `/home/user/build_opencv` - set the binary build path to your CMake build directory, e.g. `/home/user/build_opencv`
- set optional parameters - set optional parameters
- run: "Configure" - run: "Configure"
- run: "Generate" - run: "Generate"