fix MSVS2010 builds

pull/5848/head
Alexander Alekhin 10 years ago
parent 94e4498cfd
commit 2f4b334ef2
  1. 17
      cmake/OpenCVCRTLinkage.cmake

@ -2,15 +2,14 @@ if(NOT MSVC)
message(FATAL_ERROR "CRT options are available only for MSVC") message(FATAL_ERROR "CRT options are available only for MSVC")
endif() endif()
#if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore" OR ${CMAKE_SYSTEM_NAME} MATCHES "WindowsPhone") if (WINRT)
# set(WINRT TRUE) if (CMAKE_SYSTEM_VERSION MATCHES 10)
add_definitions(/DWINVER=_WIN32_WINNT_WIN10 /DNTDDI_VERSION=NTDDI_WIN10 /D_WIN32_WINNT=_WIN32_WINNT_WIN10)
if (WINRT AND CMAKE_SYSTEM_VERSION MATCHES 10) elseif(CMAKE_SYSTEM_VERSION MATCHES 8.1)
add_definitions(/DWINVER=_WIN32_WINNT_WIN10 /DNTDDI_VERSION=NTDDI_WIN10 /D_WIN32_WINNT=_WIN32_WINNT_WIN10) add_definitions(/DWINVER=_WIN32_WINNT_WINBLUE /DNTDDI_VERSION=NTDDI_WINBLUE /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE)
elseif(WINRT AND CMAKE_SYSTEM_VERSION MATCHES 8.1) else()
add_definitions(/DWINVER=_WIN32_WINNT_WINBLUE /DNTDDI_VERSION=NTDDI_WINBLUE /D_WIN32_WINNT=_WIN32_WINNT_WINBLUE) add_definitions(/DWINVER=_WIN32_WINNT_WIN8 /DNTDDI_VERSION=NTDDI_WIN8 /D_WIN32_WINNT=_WIN32_WINNT_WIN8)
else() endif()
add_definitions(/DWINVER=_WIN32_WINNT_WIN8 /DNTDDI_VERSION=NTDDI_WIN8 /D_WIN32_WINNT=_WIN32_WINNT_WIN8)
endif() endif()
# Removing LNK4075 warnings for debug WinRT builds # Removing LNK4075 warnings for debug WinRT builds

Loading…
Cancel
Save