Merge pull request #753 from taka-no-me:fix_osx_fat_java

12 years ago · e22983ddb6
parent 1e9ed14205 eeaa1e8751
commit e22983ddb6
1 changed files with 8 additions and 1 deletions
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@ -281,7 +281,14 @@ if(BUILD_FAT_JAVA_LIB)
  if(__extradeps)
    list(REMOVE_ITEM __deps ${__extradeps})
  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()
  target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS})
 endif()