projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a84a5e8
)
a fix for open issue 4772
author
jqly
<jqly@outlook.com>
Fri, 30 Jun 2017 12:22:16 +0000
(20:22 +0800)
committer
GitHub
<noreply@github.com>
Fri, 30 Jun 2017 12:22:16 +0000
(20:22 +0800)
cmake/OpenCVCompilerOptions.cmake
patch
|
blob
|
history
diff --git
a/cmake/OpenCVCompilerOptions.cmake
b/cmake/OpenCVCompilerOptions.cmake
index
8358b56
..
b8bc228
100644
(file)
--- a/
cmake/OpenCVCompilerOptions.cmake
+++ b/
cmake/OpenCVCompilerOptions.cmake
@@
-248,7
+248,9
@@
endif()
# Extra link libs if the user selects building static libs:
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
- 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}")
endif()