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
ead7d6d8
Commit
ead7d6d8
authored
Oct 17, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15716 from alalek:javadoc_fix
parents
34df28db
86e7d824
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
CMakeLists.txt
modules/java/jar/CMakeLists.txt
+7
-0
build.xml.in
modules/java/jar/build.xml.in
+1
-1
No files found.
modules/java/jar/CMakeLists.txt
View file @
ead7d6d8
...
@@ -27,6 +27,13 @@ endif()
...
@@ -27,6 +27,13 @@ endif()
set
(
OPENCV_JAVADOC_DESTINATION
"
${
OpenCV_BINARY_DIR
}
/doc/doxygen/html/javadoc"
CACHE STRING
""
)
set
(
OPENCV_JAVADOC_DESTINATION
"
${
OpenCV_BINARY_DIR
}
/doc/doxygen/html/javadoc"
CACHE STRING
""
)
# Old Javadoc URL looks like this: https://docs.oracle.com/javase/6/docs/api/
# New Javadoc URL looks like this: https://docs.oracle.com/en/java/javase/11/docs/api/
set
(
OPENCV_JAVADOC_LINK_URL
""
CACHE STRING
"See details in modules/java/jar/CMakeLists.txt"
)
if
(
OPENCV_JAVADOC_LINK_URL
)
set
(
CMAKE_CONFIG_OPENCV_JAVADOC_LINK
"link=
\"
${
OPENCV_JAVADOC_LINK_URL
}
\"
"
)
endif
()
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/build.xml.in"
"
${
OPENCV_JAVA_DIR
}
/build.xml"
@ONLY
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/build.xml.in"
"
${
OPENCV_JAVA_DIR
}
/build.xml"
@ONLY
)
list
(
APPEND depends
"
${
OPENCV_JAVA_DIR
}
/build.xml"
)
list
(
APPEND depends
"
${
OPENCV_JAVA_DIR
}
/build.xml"
)
...
...
modules/java/jar/build.xml.in
View file @
ead7d6d8
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
bottom="Generated on ${timestamp} / OpenCV @OPENCV_VCSVERSION@"
bottom="Generated on ${timestamp} / OpenCV @OPENCV_VCSVERSION@"
failonerror="true"
failonerror="true"
encoding="UTF-8" charset="UTF-8" docencoding="UTF-8"
encoding="UTF-8" charset="UTF-8" docencoding="UTF-8"
link="https://docs.oracle.com/javase/6/docs/api/"
@CMAKE_CONFIG_OPENCV_JAVADOC_LINK@
additionalparam="--allow-script-in-comments"
additionalparam="--allow-script-in-comments"
>
>
<Header>
<Header>
...
...
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