Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e22983dd
Commit
e22983dd
authored
Apr 04, 2013
by
Andrey Kamaev
Committed by
OpenCV Buildbot
Apr 04, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #753 from taka-no-me:fix_osx_fat_java
parents
1e9ed142
eeaa1e87
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
CMakeLists.txt
modules/java/CMakeLists.txt
+8
-1
No files found.
modules/java/CMakeLists.txt
View file @
e22983dd
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment