Fixed samples build with nonfree.

pull/5514/head
Alexander Smorkalov 9 years ago
parent bba8c0beac
commit 341e7b3be2
  1. 2
      samples/c/CMakeLists.txt
  2. 2
      samples/cpp/CMakeLists.txt
  3. 2
      samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
  4. 2
      samples/ocl/CMakeLists.txt

@ -16,7 +16,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
endif()
ocv_include_modules(${OPENCV_C_SAMPLES_REQUIRED_DEPS})
ocv_include_modules(${OPENCV_C_SAMPLES_REQUIRED_DEPS} opencv_nonfree)
# ---------------------------------------------
# Define executable targets

@ -15,7 +15,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
project(cpp_samples)
ocv_include_directories("${OpenCV_SOURCE_DIR}/include")#for opencv.hpp
ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS} opencv_nonfree)
if(HAVE_opencv_gpu)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")

@ -80,6 +80,6 @@ int main( int argc, char** argv )
* @function readme
*/
void readme()
{ std::cout << " Usage: ./SURF_descriptor <img1> <img2>" << std::endl; }
{ printf(" Usage: ./SURF_descriptor <img1> <img2>\n"); }
#endif

@ -10,7 +10,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
project("${project}_samples")
ocv_include_modules(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS})
ocv_include_modules(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS} opencv_nonfree)
if(HAVE_OPENCL)
ocv_include_directories(${OPENCL_INCLUDE_DIR})

Loading…
Cancel
Save