mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-18 10:25:59 +00:00
2bbef0ce64
During configuration the java wrappers are generated (if java is enabled via PACKAGECOFIG). Unfortunately, the script that generates the .java files do not handle properly paths with special symbols, such as +. This is just a workaround for that. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
17 lines
818 B
Diff
17 lines
818 B
Diff
Upstream-status: Inappropriate [OE specific] https://github.com/opencv/opencv/pull/10039#issuecomment-342539288
|
|
|
|
Signed-off-by: Ricardo Ribalda <ricardo.ribalda@gmail.com>
|
|
diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
|
|
index 74bc0ef04169..4622fbf9a5f1 100644
|
|
--- a/modules/java/CMakeLists.txt
|
|
+++ b/modules/java/CMakeLists.txt
|
|
@@ -291,7 +291,7 @@ foreach(java_file ${step3_input_files})
|
|
endif()
|
|
if(__configure)
|
|
configure_file("${java_file}" "${java_src_dir}/${output_name}" @ONLY)
|
|
- elseif(NOT "${java_file}" MATCHES "${OpenCV_BINARY_DIR}/")
|
|
+ elseif(EXISTS "${java_file}" AND NOT "${java_file}" MATCHES "${OpenCV_BINARY_DIR}/")
|
|
configure_file("${java_file}" "${java_src_dir}/${output_name}" COPYONLY)
|
|
else()
|
|
add_custom_command(OUTPUT "${java_src_dir}/${output_name}"
|