fix find windows.h for winsdk8
This commit is contained in:
parent
091cfb4580
commit
ea4aece82b
1 changed files with 8 additions and 4 deletions
|
@ -165,9 +165,13 @@ MACRO(USE_CURRENT_WINSDK)
|
||||||
SET(WINSDK_VERSION_FULL "")
|
SET(WINSDK_VERSION_FULL "")
|
||||||
|
|
||||||
# Use WINSDK environment variable
|
# Use WINSDK environment variable
|
||||||
IF(WINSDKENV_DIR AND EXISTS ${WINSDKENV_DIR}/include/Windows.h)
|
IF(WINSDKENV_DIR)
|
||||||
SET(WINSDK_DIR ${WINSDKENV_DIR})
|
FIND_PATH(WINSDK_DIR Windows.h
|
||||||
ENDIF(WINSDKENV_DIR AND EXISTS ${WINSDKENV_DIR}/include/Windows.h)
|
HINTS
|
||||||
|
${WINSDKENV_DIR}/Include/um
|
||||||
|
${WINSDKENV_DIR}/Include
|
||||||
|
)
|
||||||
|
ENDIF(WINSDKENV_DIR)
|
||||||
|
|
||||||
# Use INCLUDE environment variable
|
# Use INCLUDE environment variable
|
||||||
IF(NOT WINSDK_DIR AND WINSDKCURRENT_VERSION_INCLUDE)
|
IF(NOT WINSDK_DIR AND WINSDKCURRENT_VERSION_INCLUDE)
|
||||||
|
@ -177,7 +181,7 @@ MACRO(USE_CURRENT_WINSDK)
|
||||||
# Look for Windows.h because there are several paths
|
# Look for Windows.h because there are several paths
|
||||||
IF(EXISTS ${_INCLUDE}/Windows.h)
|
IF(EXISTS ${_INCLUDE}/Windows.h)
|
||||||
STRING(REGEX REPLACE "/(include|INCLUDE|Include)(.*)" "" WINSDK_DIR ${_INCLUDE})
|
STRING(REGEX REPLACE "/(include|INCLUDE|Include)(.*)" "" WINSDK_DIR ${_INCLUDE})
|
||||||
MESSAGE(STATUS "Found Windows SDK environment variable in ${WINSDK_DIR}")
|
MESSAGE(STATUS "Found Windows SDK from include environment variable in ${WINSDK_DIR}")
|
||||||
BREAK()
|
BREAK()
|
||||||
ENDIF(EXISTS ${_INCLUDE}/Windows.h)
|
ENDIF(EXISTS ${_INCLUDE}/Windows.h)
|
||||||
ENDFOREACH(_INCLUDE)
|
ENDFOREACH(_INCLUDE)
|
||||||
|
|
Loading…
Reference in a new issue