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
383e04d9
Commit
383e04d9
authored
Nov 27, 2012
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OpenCV Manager build via ninja (Bug #2575) fixed.
parent
214629b2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
CMakeLists.txt
android/service/engine/CMakeLists.txt
+1
-1
OpenCVDetectAndroidSDK.cmake
cmake/OpenCVDetectAndroidSDK.cmake
+7
-2
No files found.
android/service/engine/CMakeLists.txt
View file @
383e04d9
...
...
@@ -2,7 +2,7 @@ set(engine OpenCVEngine)
set
(
JNI_LIB_NAME
${
engine
}
${
engine
}
_jni
)
unset
(
__android_project_chain CACHE
)
add_android_project
(
opencv_engine
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
SDK_TARGET 8
${
ANDROID_SDK_TARGET
}
IGNORE_JAVA ON
)
add_android_project
(
opencv_engine
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
SDK_TARGET 8
${
ANDROID_SDK_TARGET
}
IGNORE_JAVA ON
IGNORE_MANIFEST ON
)
set
(
ANDROID_PLATFORM_VERSION_CODE
"0"
)
...
...
cmake/OpenCVDetectAndroidSDK.cmake
View file @
383e04d9
...
...
@@ -179,7 +179,7 @@ unset(__android_project_chain CACHE)
#add_android_project(target_name ${path} NATIVE_DEPS opencv_core LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11)
macro
(
add_android_project target path
)
# parse arguments
set
(
android_proj_arglist NATIVE_DEPS LIBRARY_DEPS SDK_TARGET IGNORE_JAVA
)
set
(
android_proj_arglist NATIVE_DEPS LIBRARY_DEPS SDK_TARGET IGNORE_JAVA
IGNORE_MANIFEST
)
set
(
__varname
"android_proj_"
)
foreach
(
v
${
android_proj_arglist
}
)
set
(
${
__varname
}${
v
}
""
)
...
...
@@ -220,9 +220,13 @@ macro(add_android_project target path)
# get project sources
file
(
GLOB_RECURSE android_proj_files RELATIVE
"
${
path
}
"
"
${
path
}
/res/*"
"
${
path
}
/src/*"
)
if
(
NOT android_proj_IGNORE_MANIFEST
)
list
(
APPEND android_proj_files
${
ANDROID_MANIFEST_FILE
}
)
endif
()
# copy sources out from the build tree
set
(
android_proj_file_deps
""
)
foreach
(
f
${
android_proj_files
}
${
ANDROID_MANIFEST_FILE
}
)
foreach
(
f
${
android_proj_files
}
)
add_custom_command
(
OUTPUT
"
${
android_proj_bin_dir
}
/
${
f
}
"
COMMAND
${
CMAKE_COMMAND
}
-E copy
"
${
path
}
/
${
f
}
"
"
${
android_proj_bin_dir
}
/
${
f
}
"
...
...
@@ -324,6 +328,7 @@ macro(add_android_project target path)
install
(
FILES
"
${
OpenCV_BINARY_DIR
}
/bin/
${
target
}
.apk"
DESTINATION
"samples"
COMPONENT main
)
get_filename_component
(
sample_dir
"
${
path
}
"
NAME
)
#java part
list
(
REMOVE_ITEM android_proj_files
${
ANDROID_MANIFEST_FILE
}
)
foreach
(
f
${
android_proj_files
}
${
ANDROID_MANIFEST_FILE
}
)
get_filename_component
(
install_subdir
"
${
f
}
"
PATH
)
install
(
FILES
"
${
android_proj_bin_dir
}
/
${
f
}
"
DESTINATION
"samples/
${
sample_dir
}
/
${
install_subdir
}
"
COMPONENT main
)
...
...
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