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
d0c76742
Commit
d0c76742
authored
Nov 12, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15891 from alalek:issue_15886
parents
a67248f3
af92a517
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+13
-0
No files found.
cmake/OpenCVCompilerOptions.cmake
View file @
d0c76742
...
...
@@ -383,6 +383,19 @@ if(MSVC)
add_definitions
(
-D_VARIADIC_MAX=10
)
endif
()
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Windows"
)
get_directory_property
(
__DIRECTORY_COMPILE_DEFINITIONS COMPILE_DEFINITIONS
)
if
((
NOT
"
${
CMAKE_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS_RELEASE
}
${
OPENCV_EXTRA_CXX_FLAGS
}
${
OPENCV_EXTRA_FLAGS_RELEASE
}
${
__DIRECTORY_COMPILE_DEFINITIONS
}
"
MATCHES
"_WIN32_WINNT"
AND NOT OPENCV_CMAKE_SKIP_MACRO_WIN32_WINNT
)
OR OPENCV_CMAKE_FORCE_MACRO_WIN32_WINNT
)
# https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
# Target Windows 7 API
set
(
OPENCV_CMAKE_MACRO_WIN32_WINNT
"0x0601"
CACHE STRING
"Value of _WIN32_WINNT macro"
)
add_definitions
(
-D_WIN32_WINNT=
${
OPENCV_CMAKE_MACRO_WIN32_WINNT
}
)
endif
()
endif
()
# Enable compiler options for OpenCV modules/apps/samples only (ignore 3rdparty)
macro
(
ocv_add_modules_compiler_options
)
if
(
MSVC AND NOT OPENCV_SKIP_MSVC_W4_OPTION
)
...
...
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