Fixed all OpenGL issues for Macos (via objective-C++ layer)

This commit is contained in:
Anatoly Baksheev
2014-02-08 19:31:24 +04:00
committed by Anatoly Baksheev
parent 069dd8a068
commit 5dc17f5d58
4 changed files with 233 additions and 3 deletions

View File

@@ -484,6 +484,10 @@ macro(ocv_glob_module_sources)
file(GLOB_RECURSE lib_int_hdrs "src/*.hpp" "src/*.h")
file(GLOB lib_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.hpp" "include/opencv2/${name}/detail/*.h")
file(GLOB_RECURSE lib_srcs_apple "src/*.m*")
if (APPLE)
list(APPEND lib_srcs ${lib_srcs_apple})
endif()
file(GLOB lib_cuda_srcs "src/cuda/*.cu")
set(cuda_objs "")
@@ -745,7 +749,11 @@ function(ocv_add_accuracy_tests)
get_native_precompiled_header(${the_target} test_precomp.hpp)
add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
if(APPLE AND ${the_target} STREQUAL "opencv_test_viz")
add_executable(${the_target} MACOSX_BUNDLE ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
else()
add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
endif()
target_link_libraries(${the_target} ${OPENCV_MODULE_${the_module}_DEPS} ${test_deps} ${OPENCV_LINKER_LIBS})
add_dependencies(opencv_tests ${the_target})