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
a0d9d6db
Commit
a0d9d6db
authored
7 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for old CMake (2.8.12.2)
parent
8533b45c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
CMakeLists.txt
modules/java/generator/CMakeLists.txt
+5
-4
No files found.
modules/java/generator/CMakeLists.txt
View file @
a0d9d6db
...
...
@@ -19,8 +19,8 @@ macro(ocv_remap_files files_list_var)
set
(
target_dir
"
${
OpenCV_BINARY_DIR
}
/configured"
)
foreach
(
f
${${
files_list_var
}}
)
if
(
NOT
"
${
f
}
"
MATCHES
"^(.*)
\\
.in$"
)
continue
()
e
ndif
()
#continue() # since CMake 3.2+
e
lse
()
set
(
f_
"
${
CMAKE_MATCH_1
}
"
)
file
(
RELATIVE_PATH rel_path0
"
${
OpenCV_SOURCE_DIR
}
"
"
${
f
}
"
)
file
(
RELATIVE_PATH rel_path1
"
${
OpenCV_SOURCE_DIR
}
"
"
${
f_
}
"
)
...
...
@@ -31,6 +31,7 @@ macro(ocv_remap_files files_list_var)
endif
()
set
(
__remap_config
"
${
__remap_config
}
{
\"
src
\"
:
\"
${
rel_path0
}
\"
,
\"
target
\"
:
\"
${
__target_file
}
\"
}"
)
list
(
APPEND __remap_targets
"
${
__target_file
}
"
)
endif
()
endforeach
()
endmacro
()
...
...
@@ -56,8 +57,8 @@ foreach(m ${OPENCV_JAVA_MODULES})
endforeach
(
m
)
set
(
CONFIG_FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/gen_java.json"
)
set
(
__config_str
"\
{
set
(
__config_str
"
{
\"
rootdir
\"
:
\"
${
OpenCV_SOURCE_DIR
}
\"
,
\"
modules
\"
: [
${
__modules_config
}
...
...
This diff is collapsed.
Click to expand it.
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