From fddefa2d6463e935d667a12644542efb6966fb6a Mon Sep 17 00:00:00 2001 From: Vladislav Sovrasov Date: Fri, 7 Oct 2016 11:39:59 +0300 Subject: [PATCH] Revert last changes in CMake for saliency module --- modules/saliency/CMakeLists.txt | 7 ------- modules/saliency/src/BING/objectnessBING.cpp | 3 --- 2 files changed, 10 deletions(-) diff --git a/modules/saliency/CMakeLists.txt b/modules/saliency/CMakeLists.txt index 456068c41..9a4016f2b 100644 --- a/modules/saliency/CMakeLists.txt +++ b/modules/saliency/CMakeLists.txt @@ -1,11 +1,4 @@ set(the_description "Saliency API") set(OPENCV_MODULE_IS_PART_OF_WORLD OFF) -add_definitions(-DOBJECTNESS_MODELS_PATH="${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}/Objectness") - -file(GLOB OBJECTNESS_TRAINED_MODELS samples/ObjectnessTrainedModel/*.yml.gz) - -install(FILES ${OBJECTNESS_TRAINED_MODELS} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/Objectness COMPONENT libs) -install(DIRECTORY DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/Objectness/Results) - ocv_define_module(saliency opencv_imgproc opencv_highgui opencv_features2d WRAP python) diff --git a/modules/saliency/src/BING/objectnessBING.cpp b/modules/saliency/src/BING/objectnessBING.cpp index 74cf9bdc3..cd3019b9b 100644 --- a/modules/saliency/src/BING/objectnessBING.cpp +++ b/modules/saliency/src/BING/objectnessBING.cpp @@ -71,9 +71,6 @@ ObjectnessBING::ObjectnessBING() setColorSpace( _Clr ); className = "BING"; - - setTrainingPath(OBJECTNESS_MODELS_PATH); - setBBResDir(OBJECTNESS_MODELS_PATH "/Results"); } ObjectnessBING::~ObjectnessBING()