Merge branch 'mingw-libdc1394-2-windows' of https://github.com/dominikrose/opencv...
authorDominik Rose <mya@server.fake>
Tue, 14 May 2013 14:31:01 +0000 (16:31 +0200)
committerDominik Rose <mya@server.fake>
Tue, 14 May 2013 14:33:31 +0000 (16:33 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
@@@ -103,19 -103,6 +103,19 @@@ if(UNIX AND NOT ANDROID
    endif()
  endif()
  
-       list(APPEND CMAKE_LIBRARY_PATH /mingw)
 +# Add these standard paths to the search paths for FIND_PATH
 +# to find include files from these locations first
 +if(MINGW)
 +  if(EXISTS /mingw)
-       list(APPEND CMAKE_LIBRARY_PATH /mingw32)
++      list(APPEND CMAKE_INCLUDE_PATH /mingw)
 +  endif()
 +  if(EXISTS /mingw32)
-       list(APPEND CMAKE_LIBRARY_PATH /mingw64)
++      list(APPEND CMAKE_INCLUDE_PATH /mingw32)
 +  endif()
 +  if(EXISTS /mingw64)
++      list(APPEND CMAKE_INCLUDE_PATH /mingw64)
 +  endif()
 +endif()
  
  # ----------------------------------------------------------------------------
  # OpenCV cmake options