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
fb2c2886
Commit
fb2c2886
authored
Sep 18, 2011
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some cmake 2.6 compatibility issues.
parent
1554d7ab
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
CMakeLists.txt
CMakeLists.txt
+9
-4
android.toolchain.cmake
android/android.toolchain.cmake
+5
-1
No files found.
CMakeLists.txt
View file @
fb2c2886
...
...
@@ -37,14 +37,14 @@ endif(NOT CMAKE_TOOLCHAIN_FILE)
# Top level OpenCV project
# --------------------------------------------------------------
if
(
NOT IOS
)
cmake_minimum_required
(
VERSION 2.6
)
cmake_minimum_required
(
VERSION 2.6
.3
)
else
()
cmake_minimum_required
(
VERSION 2.8
)
endif
()
project
(
OpenCV
)
set
(
CMAKE_CONFIGURATION_TYPES
"Debug;Release"
CACHE STRING
"Configs"
FORCE
)
if
(
DEFINED CMAKE_BUILD_TYPE
)
if
(
DEFINED CMAKE_BUILD_TYPE
AND CMAKE_VERSION VERSION_GREATER
"2.8"
)
set_property
(
CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
${
CMAKE_CONFIGURATION_TYPES
}
)
endif
()
...
...
@@ -448,7 +448,12 @@ endif()
set
(
WITH_TBB OFF CACHE BOOL
"Include Intel TBB support"
)
set
(
WITH_IPP OFF CACHE BOOL
"Include Intel IPP support"
)
set
(
WITH_EIGEN ON CACHE BOOL
"Include Eigen2/Eigen3 support"
)
set
(
WITH_CUDA ON CACHE BOOL
"Include NVidia Cuda Runtime support"
)
if
(
CMAKE_VERSION VERSION_GREATER
"2.8"
)
set
(
WITH_CUDA ON CACHE BOOL
"Include NVidia Cuda Runtime support"
)
else
()
set
(
WITH_CUDA OFF CACHE BOOL
"Include NVidia Cuda Runtime support"
)
endif
()
set
(
WITH_OPENNI OFF CACHE BOOL
"Include OpenNI support"
)
set
(
WITH_XIMEA OFF CACHE BOOL
"Include XIMEA cameras support"
)
...
...
@@ -824,7 +829,7 @@ if (BUILD_JAVA_SUPPORT)
endif
()
SET
(
ANDROID_SDK_TARGET
${
ANDROID_SDK_TARGET
}
CACHE STRING
"SDK target for Android tests and samples"
)
if
(
ANDROID_PROCESS EQUAL 0
)
if
(
ANDROID_PROCESS EQUAL 0
AND CMAKE_VERSION VERSION_GREATER
"2.8"
)
set_property
(
CACHE ANDROID_SDK_TARGET PROPERTY STRINGS
${
ANDROID_SDK_TARGETS
}
)
endif
()
string
(
REGEX MATCH
"[0-9]+$"
ANDROID_SDK_TARGET_LEVEL
"
${
ANDROID_SDK_TARGET
}
"
)
...
...
android/android.toolchain.cmake
View file @
fb2c2886
...
...
@@ -172,7 +172,9 @@ if( EXISTS "${ANDROID_NDK}" )
set
(
PossibleAndroidLevels
"3;4;5;8;9"
)
set
(
ANDROID_API_LEVEL
${
ANDROID_API_LEVEL
}
CACHE STRING
"android API level"
)
if
(
CMAKE_VERSION VERSION_GREATER
"2.8"
)
set_property
(
CACHE ANDROID_API_LEVEL PROPERTY STRINGS
${
PossibleAndroidLevels
}
)
endif
()
if
(
NOT ANDROID_API_LEVEL GREATER 2
)
set
(
ANDROID_API_LEVEL 8
)
...
...
@@ -237,7 +239,9 @@ IF( NOT ARM_TARGET)
set
(
ARM_TARGET armeabi-v7a
)
ENDIF
()
set
(
ARM_TARGET
"
${
ARM_TARGET
}
"
CACHE INTERNAL
"the arm target for android, recommend armeabi-v7a for floating point support and NEON."
)
set_property
(
CACHE ARM_TARGET PROPERTY STRINGS
${
PossibleArmTargets
}
)
if
(
CMAKE_VERSION VERSION_GREATER
"2.8"
)
set_property
(
CACHE ARM_TARGET PROPERTY STRINGS
${
PossibleArmTargets
}
)
endif
()
#set these flags for client use
if
(
ARM_TARGET STREQUAL
"armeabi"
)
...
...
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