OCV_CMake.patch

OCV patch for CMake 3.x - Alexandr Rassadin, 2015-05-22 07:06 am

Download (1.5 kB)

 
b/apps/haartraining/CMakeLists.txt
1 
cmake_policy(SET CMP0038 OLD)
2 

  		





  1
  3
  
    
SET(OPENCV_HAARTRAINING_DEPS opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_video opencv_features2d opencv_flann opencv_legacy)

  		





  2
  4
  
    
ocv_check_dependencies(${OPENCV_HAARTRAINING_DEPS})

  		





  3
  5
  
    

  		













b/cmake/OpenCVGenPkgconfig.cmake






  8
  8
  
    
#

  		





  9
  9
  
    
# ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"

  		





  10
  10
  
    
# -------------------------------------------------------------------------------------------

  		





  
  11
  
    
cmake_policy(SET CMP0026 OLD)

  		





  
  12
  
    

  		





  11
  13
  
    
set(prefix      "${CMAKE_INSTALL_PREFIX}")

  		





  12
  14
  
    
set(exec_prefix "\${prefix}")

  		





  13
  15
  
    
set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS

  		













b/cmake/OpenCVModule.cmake






  45
  45
  
    

  		





  46
  46
  
    
# clean flags for modules enabled on previous cmake run

  		





  47
  47
  
    
# this is necessary to correctly handle modules removal

  		





  
  48
  
    

  		





  
  49
  
    
cmake_policy(SET CMP0026 OLD)

  		





  
  50
  
    
cmake_policy(SET CMP0045 OLD)

  		





  
  51
  
    

  		





  48
  52
  
    
foreach(mod ${OPENCV_MODULES_BUILD} ${OPENCV_MODULES_DISABLED_USER} ${OPENCV_MODULES_DISABLED_AUTO} ${OPENCV_MODULES_DISABLED_FORCE})

  		





  49
  53
  
    
  if(HAVE_${mod})

  		





  50
  54
  
    
    unset(HAVE_${mod} CACHE)