Skip to content

O
opencv
Commit eeaa1e87 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fix link of fat java wrapper on OS X

parent 91f6eb7c
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
modules/java/CMakeLists.txt
View file @ eeaa1e87
...@@ -281,7 +281,14 @@ if(BUILD_FAT_JAVA_LIB) ...@@ -281,7 +281,14 @@ if(BUILD_FAT_JAVA_LIB)
if(__extradeps) if(__extradeps)
list(REMOVE_ITEM __deps ${__extradeps}) list(REMOVE_ITEM __deps ${__extradeps})
endif() endif()
target_link_libraries(${the_module} -Wl,-whole-archive ${__deps} -Wl,-no-whole-archive ${__extradeps} ${OPENCV_LINKER_LIBS}) if(APPLE)
foreach(_dep ${__deps})
target_link_libraries(${the_module} -Wl,-force_load "${_dep}")
endforeach()
else()
target_link_libraries(${the_module} -Wl,-whole-archive ${__deps} -Wl,-no-whole-archive)
endif()
target_link_libraries(${the_module} ${__extradeps} ${OPENCV_LINKER_LIBS})
else() else()
target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS}) target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS})
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment