include_order.patch

Kazuki Matsuda, 2011-12-15 05:21 pm

Download (2.1 kB)

 
CMakeLists.txt (working copy)
1186 1186 
# ---------------------------------------------------------------------------
1187 1187 
# The C+//0 include & link directories:
1188 1188 
# ---------------------------------------------------------------------------
1189 
include_directories("."
1189 
include_directories(BEFORE "."
1190 1190 
    "${OPENCV_CONFIG_FILE_INCLUDE_DIR}"
1191 1191 
    "${CMAKE_CURRENT_SOURCE_DIR}/include"
1192 1192 
    "${CMAKE_CURRENT_SOURCE_DIR}/include/opencv"
OpenCVModule.cmake (working copy)
36 36 
            if(d MATCHES "opencv_")
37 37 
                string(REPLACE "opencv_" "${OpenCV_SOURCE_DIR}/modules/" d_dir ${d})
38 38 
                if (EXISTS "${d_dir}/include")
39 
                   include_directories("${d_dir}/include")
39 
                   include_directories(BEFORE "${d_dir}/include")
40 40 
                endif()
41 41 
            endif()
42 42 
        endforeach()
......
85 85 
            if(d MATCHES "opencv_")
86 86 
                string(REPLACE "opencv_" "${OpenCV_SOURCE_DIR}/modules/" d_dir ${d})
87 87 
                if (EXISTS "${d_dir}/include")
88 
                   include_directories("${d_dir}/include")
88 
                   include_directories(BEFORE "${d_dir}/include")
89 89 
                endif()
90 90 
            endif()
91 91 
        endforeach()
......
129 129
130 130 
    project(opencv_${name})
131 131 

  		





  132
  
  
    
    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"

  		





  
  132
  
    
    include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/include"

  		





  133
  133
  
    
                        "${CMAKE_CURRENT_SOURCE_DIR}/src"

  		





  134
  134
  
    
                        "${CMAKE_CURRENT_BINARY_DIR}")

  		





  135
  135
  
    
    

  		





  ......




  137
  137
  
    
        if(d MATCHES "opencv_")

  		





  138
  138
  
    
            string(REPLACE "opencv_" "${OpenCV_SOURCE_DIR}/modules/" d_dir ${d})

  		





  139
  139
  
    
            if (EXISTS "${d_dir}/include")

  		





  140
  
  
    
                include_directories("${d_dir}/include")

  		





  
  140
  
    
                include_directories(BEFORE "${d_dir}/include")

  		





  141
  141
  
    
            endif()

  		





  142
  142
  
    
        endif()

  		





  143
  143
  
    
    endforeach()