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
4d8a261d
Commit
4d8a261d
authored
Jul 13, 2011
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allowed spaces in path to OpenCV (tested only Android build)
parent
0b6fed32
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
OpenCVPCHSupport.cmake
OpenCVPCHSupport.cmake
+2
-2
CMakeLists.txt
modules/java/CMakeLists.txt
+5
-1
CMakeLists.txt
samples/android/CMakeLists.txt
+5
-1
No files found.
OpenCVPCHSupport.cmake
View file @
4d8a261d
...
...
@@ -129,9 +129,9 @@ MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn )
# if you have different versions of the headers for different build types
# you may set _pch_dowarn
IF
(
_dowarn
)
SET
(
${
_cflags
}
"
${
PCH_ADDITIONAL_COMPILER_FLAGS
}
-include
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
_header_name
}
-Winvalid-pch "
)
SET
(
${
_cflags
}
"
${
PCH_ADDITIONAL_COMPILER_FLAGS
}
-include
\"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
_header_name
}
\"
-Winvalid-pch "
)
ELSE
(
_dowarn
)
SET
(
${
_cflags
}
"
${
PCH_ADDITIONAL_COMPILER_FLAGS
}
-include
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
_header_name
}
"
)
SET
(
${
_cflags
}
"
${
PCH_ADDITIONAL_COMPILER_FLAGS
}
-include
\"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
_header_name
}
\"
"
)
ENDIF
(
_dowarn
)
ELSE
(
CMAKE_COMPILER_IS_GNUCXX
)
...
...
modules/java/CMakeLists.txt
View file @
4d8a261d
...
...
@@ -171,7 +171,11 @@ endforeach()
#android test project
if
(
ANDROID AND BUILD_TESTS AND CAN_BUILD_ANDROID_PROJECTS
)
file
(
COPY android_test DESTINATION
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
PATTERN
".svn"
EXCLUDE
)
file
(
COPY android_test DESTINATION
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
PATTERN
".svn"
EXCLUDE
PATTERN
"gen"
EXCLUDE
PATTERN
"bin"
EXCLUDE
)
SET
(
test_dir
"
${
CMAKE_CURRENT_BINARY_DIR
}
/android_test"
)
SET
(
test_name opencv_test_java
)
...
...
samples/android/CMakeLists.txt
View file @
4d8a261d
...
...
@@ -93,7 +93,11 @@ if (BUILD_ANDROID_EXAMPLES)
list(REMOVE_ITEM android_samples hello-android)
list(SORT android_samples)
file(COPY
${
android_samples
}
DESTINATION "
${
CMAKE_CURRENT_BINARY_DIR
}
" PATTERN "
.svn
" EXCLUDE)
file(COPY
${
android_samples
}
DESTINATION "
${
CMAKE_CURRENT_BINARY_DIR
}
"
PATTERN "
.svn
" EXCLUDE
PATTERN "
gen
" EXCLUDE
PATTERN "
bin
" EXCLUDE
)
foreach(sample
${
android_samples
}
)
if(EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
sample
}
/AndroidManifest.xml)
...
...
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