cmake scripts are updated to prefer includes from the OpenCV source tree

2012-03-03 15:49:23 +00:00
parent aeaae8b057
commit 18dbe6b3e5
29 changed files with 170 additions and 177 deletions
--- a/modules/androidcamera/CMakeLists.txt
+++ b/modules/androidcamera/CMakeLists.txt
@@ -6,7 +6,7 @@ set(the_description "Auxiliary module for Android native camera support")
 set(OPENCV_MODULE_TYPE STATIC)

 ocv_define_module(androidcamera INTERNAL log dl)
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper")
+ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper")

 # Android source tree for native camera
 SET (ANDROID_SOURCE_TREE "ANDROID_SOURCE_TREE-NOTFOUND" CACHE PATH
--- a/modules/androidcamera/camera_wrapper/CMakeLists.txt
+++ b/modules/androidcamera/camera_wrapper/CMakeLists.txt
@@ -4,7 +4,7 @@ project(${the_target})

 link_directories("${ANDROID_SOURCE_TREE}/out/target/product/generic/system/lib")

-INCLUDE_DIRECTORIES(
+INCLUDE_DIRECTORIES(BEFORE
 	${ANDROID_SOURCE_TREE}
 	${ANDROID_SOURCE_TREE}/frameworks/base/include/ui
 	${ANDROID_SOURCE_TREE}/frameworks/base/include/surfaceflinger
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -6,7 +6,7 @@ if(HAVE_CUDA)
  file(GLOB lib_cuda "src/cuda/*.cu")
  source_group("Cuda" FILES "${lib_cuda}")
  
-  include_directories(${CUDA_INCLUDE_DIRS} "${OpenCV_SOURCE_DIR}/modules/gpu/src" "${OpenCV_SOURCE_DIR}/modules/gpu/src/cuda")  
+  ocv_include_directories(${CUDA_INCLUDE_DIRS} "${OpenCV_SOURCE_DIR}/modules/gpu/src" "${OpenCV_SOURCE_DIR}/modules/gpu/src/cuda")  
  OCV_CUDA_COMPILE(cuda_objs ${lib_cuda})
  
  set(cuda_link_libs ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -28,7 +28,7 @@ if (HAVE_CUDA)
  set(ncv_files ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda})

  source_group("Src\\NVidia" FILES ${ncv_files})
-  include_directories("src/nvidia" "src/nvidia/core" "src/nvidia/NPP_staging" ${CUDA_INCLUDE_DIRS})
+  ocv_include_directories("src/nvidia" "src/nvidia/core" "src/nvidia/NPP_staging" ${CUDA_INCLUDE_DIRS})

  #set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-keep")
  #set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;/EHsc-;")
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -10,38 +10,38 @@ ocv_add_module(highgui opencv_imgproc OPTIONAL opencv_androidcamera)
 set(GRFMT_LIBS "")

 if(WITH_PNG OR WITH_TIFF OR WITH_OPENEXR)
-  include_directories(${ZLIB_INCLUDE_DIR})
+  ocv_include_directories(${ZLIB_INCLUDE_DIR})
  set(GRFMT_LIBS ${GRFMT_LIBS} ${ZLIB_LIBRARIES})
 endif()

 if(WITH_JPEG)
  add_definitions(-DHAVE_JPEG)
-  include_directories(${JPEG_INCLUDE_DIR})
+  ocv_include_directories(${JPEG_INCLUDE_DIR})
  set(GRFMT_LIBS ${GRFMT_LIBS} ${JPEG_LIBRARIES})
 endif()

 if(WITH_PNG)
  add_definitions(-DHAVE_PNG)
  add_definitions(${PNG_DEFINITIONS})
-  include_directories(${PNG_INCLUDE_DIR})
+  ocv_include_directories(${PNG_INCLUDE_DIR})
  set(GRFMT_LIBS ${GRFMT_LIBS} ${PNG_LIBRARIES})
 endif()

 if(WITH_TIFF)
  add_definitions(-DHAVE_TIFF)
-  include_directories(${TIFF_INCLUDE_DIR})
+  ocv_include_directories(${TIFF_INCLUDE_DIR})
  set(GRFMT_LIBS ${GRFMT_LIBS} ${TIFF_LIBRARIES})
 endif()

 if(WITH_JASPER)
  add_definitions(-DHAVE_JASPER)
-  include_directories(${JASPER_INCLUDE_DIR})
+  ocv_include_directories(${JASPER_INCLUDE_DIR})
  set(GRFMT_LIBS ${GRFMT_LIBS} ${JASPER_LIBRARIES})
 endif()

 if(WITH_OPENEXR AND OPENEXR_FOUND)
  add_definitions(-DHAVE_OPENEXR)
-  include_directories(${OPENEXR_INCLUDE_PATHS})
+  ocv_include_directories(${OPENEXR_INCLUDE_PATHS})
  set(GRFMT_LIBS ${GRFMT_LIBS} ${OPENEXR_LIBRARIES})
 endif()

@@ -139,7 +139,7 @@ if(UNIX)
    endif()

    foreach(P ${HIGHGUI_INCLUDE_DIRS})
-        include_directories(${P})
+        ocv_include_directories(${P})
    endforeach()

    foreach(P ${HIGHGUI_LIBRARY_DIRS})
@@ -150,7 +150,7 @@ endif()
 #OpenNI
 if(WITH_OPENNI AND HAVE_OPENNI)
    set(highgui_srcs ${highgui_srcs} src/cap_openni.cpp)
-    include_directories(${OPENNI_INCLUDE_DIR})
+    ocv_include_directories(${OPENNI_INCLUDE_DIR})
 endif()

 #YV
@@ -192,7 +192,7 @@ endif()

 if(HAVE_XIMEA AND XIMEA_FOUND)
  set(highgui_srcs ${highgui_srcs} src/cap_ximea.cpp)
-  include_directories(${XIMEA_PATH})
+  ocv_include_directories(${XIMEA_PATH})
  link_directories(${XIMEA_LIBRARY_DIR})
  set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} m3api)
  set(highgui_srcs ${highgui_srcs} src/cap_ximea.cpp)
@@ -221,7 +221,7 @@ endif()

 if(WIN32)
  link_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/lib")
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")#for directshow
+  include_directories(AFTER "${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include") #for directshow
 endif()

 source_group("Src" FILES ${highgui_srcs} ${highgui_hdrs})
@@ -245,5 +245,36 @@ set_target_properties(${the_module} PROPERTIES LINK_INTERFACE_LIBRARIES "")

 ocv_add_precompiled_headers(${the_module})

+if(WIN32)
+  #copy ffmpeg dll to the output folder
+  if(MSVC64 OR MINGW64)
+    set(FFMPEG_SUFFIX _64)
+  endif()
+  
+  set(ffmpeg_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll")
+  set(ffmpeg_path "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/${ffmpeg_bare_name}")
+  
+  if(CMAKE_VERSION VERSION_GREATER "2.8.2")
+    add_custom_command(TARGET ${the_module} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/$<CONFIGURATION>/${ffmpeg_bare_name}"
+                       COMMENT "Copying ${ffmpeg_path} to the output directory")
+  elseif(MSVC_IDE)
+    add_custom_command(TARGET ${the_module} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Release/${ffmpeg_bare_name}"
+                       COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Debug/${ffmpeg_bare_name}"
+                       COMMENT "Copying ${ffmpeg_path} to the output directory")
+  elseif(MSVC)
+    add_custom_command(TARGET ${the_module} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${ffmpeg_bare_name}"
+                       COMMENT "Copying ${ffmpeg_path} to the output directory")
+  else()
+    add_custom_command(TARGET ${the_module} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${ffmpeg_bare_name}"
+                       COMMENT "Copying ${ffmpeg_path} to the output directory")
+  endif()
+  
+  install(FILES "${ffmpeg_path}" DESTINATION bin COMPONENT main)
+endif()
+
 ocv_add_accuracy_tests()
 ocv_add_perf_tests()
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -19,7 +19,7 @@ foreach(module ${OPENCV_JAVA_MODULES})
 endforeach()

 set(target ${the_module})
-include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp")
+ocv_include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp")

 set(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/gen_java.py")
 set(HDR_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py")
@@ -105,7 +105,7 @@ endforeach()
 # all needed includes
 foreach(module ${OPENCV_MODULE_${the_module}_DEPS})
  string(REPLACE "opencv_" "" module "${module}")
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include")
+  ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include")
 endforeach()

 # created list of documented files targets
--- a/modules/python/CMakeLists.txt
+++ b/modules/python/CMakeLists.txt
@@ -12,8 +12,8 @@ endif()
 set(the_description "The python bindings")
 ocv_add_module(python BINDINGS opencv_core opencv_flann opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_objdetect opencv_legacy opencv_contrib)

-include_directories(${PYTHON_INCLUDE_PATH})
-include_directories(
+ocv_include_directories(${PYTHON_INCLUDE_PATH})
+ocv_include_directories(
    "${CMAKE_CURRENT_SOURCE_DIR}/src2"
    "${OpenCV_SOURCE_DIR}/modules/core/include"
    "${OpenCV_SOURCE_DIR}/modules/flann/include"