Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-15 07:29:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3966 from Dikay900:master_diff_to_2_4_2

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-04-28 11:00:57 +00:00
parent 7245803405 63dbeeaac5
commit e60dcc9b3b
13 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVCompilerOptions.cmake
View File

@@ -281,6 +281,11 @@ if(MSVC)
endif()
endif()
if(MSVC12 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /FS")
set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} /FS")
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