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
44098b2f
Commit
44098b2f
authored
Apr 17, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#1813 fixed compiler options with profiling enabled
parent
3dfa9178
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
android.toolchain.cmake
android/android.toolchain.cmake
+1
-1
OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+5
-0
OpenCVIOLibs.cmake
cmake/OpenCVIOLibs.cmake
+7
-1
No files found.
android/android.toolchain.cmake
View file @
44098b2f
...
...
@@ -1056,6 +1056,7 @@ endif()
# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a" or "x86" depending on ANDROID_ABI
# ANDROID_ARCH_NAME : "arm" or "x86" depending on ANDROID_ABI
# TOOL_OS_SUFFIX : "" or ".exe" depending on host platform
# ANDROID_SYSROOT : path to the compiler sysroot
# ANDROID_SYSTEM_INCLUDE_DIRS
# ANDROID_SYSTEM_LIB_DIRS
# Obsolete:
...
...
@@ -1065,7 +1066,6 @@ endif()
# ANDROID_COMPILER_VERSION : GCC version used
# ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform
# ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI
# ANDROID_SYSROOT : path to the compiler sysroot
# ANDROID_TOOLCHAIN_NAME : "standalone", "arm-linux-androideabi-4.4.3" or "x86-4.4.3" or something similar.
# ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux"
# ANDROID_TOOLCHAIN_ROOT : path to the top level of toolchain (standalone or placed inside NDK)
...
...
cmake/OpenCVCompilerOptions.cmake
View file @
44098b2f
...
...
@@ -116,6 +116,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# Profiling?
if
(
ENABLE_PROFILING
)
set
(
OPENCV_EXTRA_C_FLAGS_RELEASE
"
${
OPENCV_EXTRA_C_FLAGS_RELEASE
}
-pg -g"
)
# turn off incompatible options
foreach
(
flags CMAKE_CXX_FLAGS CMAKE_C_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG OPENCV_EXTRA_C_FLAGS_RELEASE
)
string
(
REPLACE
"-fomit-frame-pointer"
""
${
flags
}
"
${${
flags
}}
"
)
string
(
REPLACE
"-ffunction-sections"
""
${
flags
}
"
${${
flags
}}
"
)
endforeach
()
elseif
(
NOT APPLE AND NOT ANDROID
)
# Remove unreferenced functions: function level linking
set
(
OPENCV_EXTRA_C_FLAGS
"
${
OPENCV_EXTRA_C_FLAGS
}
-ffunction-sections"
)
...
...
cmake/OpenCVIOLibs.cmake
View file @
44098b2f
...
...
@@ -9,9 +9,15 @@ if(BUILD_ZLIB)
unset_all
(
ZLIB_FOUND
)
else
()
include
(
FindZLIB
)
if
(
NOT ZLIB_VERSION_STRING
)
if
(
ZLIB_FOUND AND
NOT ZLIB_VERSION_STRING
)
ocv_parse_header2
(
ZLIB
"
${
ZLIB_INCLUDE_DIR
}
/zlib.h"
ZLIB_VERSION
""
)
endif
()
if
(
ZLIB_FOUND AND ANDROID
)
if
(
ZLIB_LIBRARY STREQUAL
"
${
ANDROID_SYSROOT
}
/usr/lib/libz.so"
)
set
(
ZLIB_LIBRARY z
)
set
(
ZLIB_LIBRARIES z
)
endif
()
endif
()
endif
()
if
(
NOT ZLIB_FOUND
)
...
...
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