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
8d907d2e
Commit
8d907d2e
authored
Dec 14, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION
parent
3903174f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
OpenCVDetectApacheAnt.cmake
cmake/OpenCVDetectApacheAnt.cmake
+3
-0
CMakeLists.txt
modules/java/jar/CMakeLists.txt
+7
-0
build.xml.in
modules/java/jar/build.xml.in
+1
-1
No files found.
cmake/OpenCVDetectApacheAnt.cmake
View file @
8d907d2e
set
(
OPENCV_JAVA_SOURCE_VERSION
""
CACHE STRING
"Java source version (javac Ant target)"
)
set
(
OPENCV_JAVA_TARGET_VERSION
""
CACHE STRING
"Java target version (javac Ant target)"
)
file
(
TO_CMAKE_PATH
"$ENV{ANT_DIR}"
ANT_DIR_ENV_PATH
)
file
(
TO_CMAKE_PATH
"$ENV{ProgramFiles}"
ProgramFiles_ENV_PATH
)
...
...
modules/java/jar/CMakeLists.txt
View file @
8d907d2e
...
...
@@ -18,6 +18,13 @@ set(depends gen_opencv_java_source "${OPENCV_DEPHELPER}/gen_opencv_java_source")
ocv_copyfiles_add_target
(
${
the_module
}
_jar_source_copy JAVA_SRC_COPY
"Copy Java(JAR) source files"
${
depends
}
)
set
(
depends
${
the_module
}
_jar_source_copy
"
${
OPENCV_DEPHELPER
}
/
${
the_module
}
_jar_source_copy"
)
if
(
OPENCV_JAVA_SOURCE_VERSION
)
set
(
OPENCV_ANT_JAVAC_EXTRA_ATTRS
"
${
OPENCV_ANT_JAVAC_EXTRA_ATTRS
}
source=
\"
${
OPENCV_JAVA_SOURCE_VERSION
}
\"
"
)
endif
()
if
(
OPENCV_JAVA_TARGET_VERSION
)
set
(
OPENCV_ANT_JAVAC_EXTRA_ATTRS
"
${
OPENCV_ANT_JAVAC_EXTRA_ATTRS
}
target=
\"
${
OPENCV_JAVA_TARGET_VERSION
}
\"
"
)
endif
()
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/build.xml.in"
"
${
OPENCV_JAVA_DIR
}
/build.xml"
@ONLY
)
list
(
APPEND depends
"
${
OPENCV_JAVA_DIR
}
/build.xml"
)
...
...
modules/java/jar/build.xml.in
View file @
8d907d2e
...
...
@@ -11,7 +11,7 @@
<!-- This is to make a jar with a source attachment, for e.g. easy -->
<!-- navigation in Eclipse. See this question: -->
<!-- http://stackoverflow.com/questions/3584968/ant-how-to-compile-jar-that-includes-source-attachment -->
<javac sourcepath="" srcdir="java" destdir="build/classes" debug="on" includeantruntime="false" >
<javac sourcepath="" srcdir="java" destdir="build/classes" debug="on" includeantruntime="false"
@OPENCV_ANT_JAVAC_EXTRA_ATTRS@
>
<include name="**/*.java"/>
<compilerarg line="-encoding utf-8"/>
</javac>
...
...
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