Skip to content

O
opencv
Commit 4f01ad85 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #9052 from jqly:patch-1

parents 5590aea4 44459301
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
cmake/OpenCVCompilerOptions.cmake
View file @ 4f01ad85
...@@ -248,7 +248,9 @@ endif() ...@@ -248,7 +248,9 @@ endif()
# Extra link libs if the user selects building static libs: # Extra link libs if the user selects building static libs:
if(NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX AND NOT ANDROID) if(NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX AND NOT ANDROID)
# Android does not need these settings because they are already set by toolchain file # Android does not need these settings because they are already set by toolchain file
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++) if(NOT MINGW)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
endif()
set(OPENCV_EXTRA_FLAGS "-fPIC ${OPENCV_EXTRA_FLAGS}") set(OPENCV_EXTRA_FLAGS "-fPIC ${OPENCV_EXTRA_FLAGS}")
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment