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
c46affe6
Commit
c46affe6
authored
Oct 11, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
android.toolchain.cmake: restore implicit link with math library for C++ objects
Ticket #2426
parent
7cb525d6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
android.toolchain.cmake
android/android.toolchain.cmake
+11
-0
No files found.
android/android.toolchain.cmake
View file @
c46affe6
...
@@ -231,6 +231,12 @@
...
@@ -231,6 +231,12 @@
# [+] added NDK release name detection (see ANDROID_NDK_RELEASE)
# [+] added NDK release name detection (see ANDROID_NDK_RELEASE)
# [+] added support for all C++ runtimes from NDK
# [+] added support for all C++ runtimes from NDK
# (system, gabi++, stlport, gnustl)
# (system, gabi++, stlport, gnustl)
# [+] improved warnings on known issues of NDKs
# [~] use gold linker as default if available (NDK r8b)
# [~] globally turned off rpath
# [~] compiler options are aligned with NDK r8b
# - modified October 2012
# [~] fixed C++ linking: explicitly link with math library (OpenCV #2426)
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
cmake_minimum_required
(
VERSION 2.6.3
)
cmake_minimum_required
(
VERSION 2.6.3
)
...
@@ -1091,6 +1097,11 @@ if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" )
...
@@ -1091,6 +1097,11 @@ if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" )
set
(
CMAKE_C_CREATE_SHARED_MODULE
"
${
CMAKE_C_CREATE_SHARED_MODULE
}
\"
${
__libsupcxx
}
\"
"
)
set
(
CMAKE_C_CREATE_SHARED_MODULE
"
${
CMAKE_C_CREATE_SHARED_MODULE
}
\"
${
__libsupcxx
}
\"
"
)
set
(
CMAKE_C_LINK_EXECUTABLE
"
${
CMAKE_C_LINK_EXECUTABLE
}
\"
${
__libsupcxx
}
\"
"
)
set
(
CMAKE_C_LINK_EXECUTABLE
"
${
CMAKE_C_LINK_EXECUTABLE
}
\"
${
__libsupcxx
}
\"
"
)
endif
()
endif
()
if
(
ANDROID_STL MATCHES
"gnustl"
)
set
(
CMAKE_CXX_CREATE_SHARED_LIBRARY
"
${
CMAKE_CXX_CREATE_SHARED_LIBRARY
}
-lm"
)
set
(
CMAKE_CXX_CREATE_SHARED_MODULE
"
${
CMAKE_CXX_CREATE_SHARED_MODULE
}
-lm"
)
set
(
CMAKE_CXX_LINK_EXECUTABLE
"
${
CMAKE_CXX_LINK_EXECUTABLE
}
-lm"
)
endif
()
endif
()
endif
()
# variables controlling optional build flags
# variables controlling optional build flags
...
...
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