potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-05-21 14:56:07 +00:00
parent 9bc5afd278
commit fd68cc768a
7 changed files with 139 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/world/CMakeLists.txt
+5 -1
View File
@@ -52,7 +52,11 @@ foreach(m ${OPENCV_MODULE_${the_module}_DEPS})
get_filename_component(srcname_we ${srcname} NAME_WE)
string(REGEX REPLACE <SRC_NAME_WE> "${srcname_we}" objpath2 "${objpath1}")
string(REGEX REPLACE <RELATIVE_SRC_NAME> "${srcname}" objpath3 "${objpath2}")
file(RELATIVE_PATH objpath4 "${CMAKE_CURRENT_BINARY_DIR}" "${objpath3}")
if(CMAKE_GENERATOR MATCHES Xcode)
set(objpath4 ${objpath3})
else()
file(RELATIVE_PATH objpath4 "${CMAKE_CURRENT_BINARY_DIR}" "${objpath3}")
endif()
list(APPEND objlist "\"${objpath4}\"")
endif()
endforeach()