|
|
|
@ -37,7 +37,7 @@ MACRO(DETECT_WINSDK_VERSION _VERSION)
|
|
|
|
|
ENDIF(NOT WINSDK${_VERSION}_FOUND)
|
|
|
|
|
ENDMACRO(DETECT_WINSDK_VERSION)
|
|
|
|
|
|
|
|
|
|
SET(WINSDK_VERSIONS "8.1" "8.0" "8.0A" "7.1" "7.1A" "7.0" "7.0A" "6.1" "6.0" "6.0A")
|
|
|
|
|
SET(WINSDK_VERSIONS "8.1" "8.0" "7.1" "7.1A" "7.0" "7.0A" "6.1" "6.0" "6.0A")
|
|
|
|
|
SET(WINSDK_DETECTED_VERSIONS)
|
|
|
|
|
|
|
|
|
|
# Search all supported Windows SDKs
|
|
|
|
@ -334,7 +334,7 @@ IF(WINSDK_INCLUDE_DIR)
|
|
|
|
|
SET(WINSDK_FOUND ON)
|
|
|
|
|
SET(WINSDK_INCLUDE_DIRS ${WINSDK_INCLUDE_DIR} ${WINSDK_SHARED_INCLUDE_DIR} ${WINSDK_OPENGL_INCLUDE_DIR})
|
|
|
|
|
SET(CMAKE_LIBRARY_PATH ${WINSDK_LIBRARY_DIR} ${CMAKE_LIBRARY_PATH})
|
|
|
|
|
INCLUDE_DIRECTORIES(${WINSDK_INCLUDE_DIRS})
|
|
|
|
|
INCLUDE_DIRECTORIES(${WINSDK_INCLUDE_DIRS}) # TODO: Move this after all other includes somehow...
|
|
|
|
|
|
|
|
|
|
# Fix for using Windows SDK 7.1 with Visual C++ 2012
|
|
|
|
|
IF(WINSDK_VERSION STREQUAL "7.1" AND MSVC11)
|
|
|
|
|