opencv_build_with_static_crt_integration.patch

Integration patch - Eugene Khvedchenya, 2011-03-30 10:55 pm

Download (1.7 kB)

 
CMakeLists.txt (working copy)
11 11 

  		





  12
  12
  
    
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)


  		





  13
  13
  
    

  		





  14
  
  
    

  		





  15
  14
  
    
# Add these standard paths to the search paths for FIND_LIBRARY


  		





  16
  15
  
    
# to find libraries from these locations first


  		





  17
  16
  
    
if(UNIX)


  		





  ......




  54
  53
  
    

  		





  55
  54
  
    
cmake_minimum_required(VERSION 2.4)


  		





  56
  55
  
    

  		





  
  56
  
    
include (CMakeStaticRuntimeOption.cmake REQUIRED)


  		





  57
  57
  
    

  		





  58
  58
  
    
if(MSVC)


  		





  59
  59
  
    
    set(CMAKE_USE_RELATIVE_PATHS ON CACHE INTERNAL "" FORCE)


  		













modules/haartraining/CMakeLists.txt	(working copy)







  15
  15
  
    
    )

  		





  16
  16
  
    

  		





  17
  17
  
    
if(WIN32)

  		





  18
  
  
    
    link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})

  		





  
  18
  
    
    link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_SOURCE_DIR}/3rdparty/lib ${CMAKE_CURRENT_BINARY_DIR})

  		





  19
  19
  
    
endif()

  		





  20
  20
  
    

  		





  21
  21
  
    
set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)

  		













modules/traincascade/CMakeLists.txt	(working copy)







  14
  14
  
    
    "${CMAKE_SOURCE_DIR}/modules/legacy/include"

  		





  15
  15
  
    
    )

  		





  16
  16
  
    

  		





  
  17
  
    
if(WIN32)

  		





  
  18
  
    
    link_directories(${CMAKE_SOURCE_DIR}/3rdparty/lib)

  		





  
  19
  
    
endif()

  		





  
  20
  
    

  		





  17
  21
  
    
set(traincascade_libs opencv_core opencv_ml opencv_imgproc

  		





  18
  22
  
    
    opencv_objdetect opencv_highgui opencv_haartraining_engine)

  		





  19
  23