diff --git a/modules/cnn_3dobj/README.md b/modules/cnn_3dobj/README.md index 5872f49f9..88e46673c 100755 --- a/modules/cnn_3dobj/README.md +++ b/modules/cnn_3dobj/README.md @@ -30,7 +30,7 @@ $ sudo make install $ cd $ mkdir build $ cd build -$ cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D BUILD_NEW_PYTHON_SUPPORT=OFF -D WITH_V4L=ON -D WITH_QT=OFF -D WITH_OPENGL=ON -D WITH_VTK=ON -D INSTALL_TESTS=ON -D OPENCV_EXTRA_MODULES_PATH=/modules .. +$ cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D WITH_V4L=ON -D WITH_QT=OFF -D WITH_OPENGL=ON -D WITH_VTK=ON -D INSTALL_TESTS=ON -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules .. $ make -j4 $ sudo make install ``` diff --git a/modules/cnn_3dobj/samples/CMakeLists.txt b/modules/cnn_3dobj/samples/CMakeLists.txt index 5bbba8c96..e283f8ef3 100755 --- a/modules/cnn_3dobj/samples/CMakeLists.txt +++ b/modules/cnn_3dobj/samples/CMakeLists.txt @@ -6,16 +6,16 @@ find_package(OpenCV REQUIRED) set(SOURCES_generator demo_sphereview_data.cpp) include_directories(${OpenCV_INCLUDE_DIRS}) add_executable(sphereview_test ${SOURCES_generator}) -target_link_libraries(sphereview_test ${OpenCV_LIBS}) +target_link_libraries(sphereview_test opencv_core opencv_imgproc opencv_highgui opencv_cnn_3dobj opencv_xfeatures2d) set(SOURCES_classifier demo_classify.cpp) add_executable(classify_test ${SOURCES_classifier}) -target_link_libraries(classify_test ${OpenCV_LIBS}) +target_link_libraries(classify_test opencv_core opencv_imgproc opencv_highgui opencv_cnn_3dobj opencv_xfeatures2d) set(SOURCES_modelanalysis demo_model_analysis.cpp) add_executable(model_test ${SOURCES_modelanalysis}) -target_link_libraries(model_test ${OpenCV_LIBS}) +target_link_libraries(model_test opencv_core opencv_imgproc opencv_highgui opencv_cnn_3dobj opencv_xfeatures2d) set(SOURCES_video demo_video.cpp) add_executable(video_test ${SOURCES_video}) -target_link_libraries(video_test ${OpenCV_LIBS}) +target_link_libraries(video_test opencv_core opencv_imgproc opencv_highgui opencv_cnn_3dobj opencv_xfeatures2d) diff --git a/modules/cnn_3dobj/samples/demo_classify.cpp b/modules/cnn_3dobj/samples/demo_classify.cpp index e5999c30c..25dbb0ee5 100755 --- a/modules/cnn_3dobj/samples/demo_classify.cpp +++ b/modules/cnn_3dobj/samples/demo_classify.cpp @@ -37,7 +37,6 @@ * @brief Feature extraction and classification. * @author Yida Wang */ -#define HAVE_CAFFE #include #include #include diff --git a/modules/cnn_3dobj/samples/demo_model_analysis.cpp b/modules/cnn_3dobj/samples/demo_model_analysis.cpp index 140a24bff..b6662af8b 100755 --- a/modules/cnn_3dobj/samples/demo_model_analysis.cpp +++ b/modules/cnn_3dobj/samples/demo_model_analysis.cpp @@ -37,7 +37,6 @@ * @brief Generating training data for CNN with triplet loss. * @author Yida Wang */ -#define HAVE_CAFFE #include #include "opencv2/imgproc.hpp" #include "opencv2/cnn_3dobj.hpp" diff --git a/modules/cnn_3dobj/samples/demo_sphereview_data.cpp b/modules/cnn_3dobj/samples/demo_sphereview_data.cpp index bdd2fdb0d..c1f8d4297 100755 --- a/modules/cnn_3dobj/samples/demo_sphereview_data.cpp +++ b/modules/cnn_3dobj/samples/demo_sphereview_data.cpp @@ -37,7 +37,6 @@ * @brief Generating training data for CNN with triplet loss. * @author Yida Wang */ -#define HAVE_CAFFE #include #include #include diff --git a/modules/cnn_3dobj/samples/demo_video.cpp b/modules/cnn_3dobj/samples/demo_video.cpp index b4cbd7cfa..91e2c7b0c 100755 --- a/modules/cnn_3dobj/samples/demo_video.cpp +++ b/modules/cnn_3dobj/samples/demo_video.cpp @@ -2,7 +2,6 @@ #include #include #include -#define HAVE_CAFFE #include #include #include