conf

git/command.md

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 git submodule update --init --recursive
-=======
 git fetch --all  
 git reset --hard origin/master 
 git pull
->>>>>>> 70752a4e25d402dfc5a853164331ec9601d63a78

opencv/install.md

@@ -18,7 +18,9 @@ mkdir my_build
 cd my_build
 
 ## cmake 中会下载安装一个大文件，网速会很慢
-cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local ..
+cmake -D CMAKE_BUILD_TYPE=Release \
+    -D OPENCV_EXTRA_MODULES_PATH=/home/lab_01/program/opencv_contrib-3.3.0/modules \
+    -D CMAKE_INSTALL_PREFIX=/usr/local ..
 
 sudo make
 sudo make install