Fixed: Wrong cases
This commit is contained in:
parent
0943667a57
commit
6f59be0acb
1 changed files with 12 additions and 8 deletions
|
@ -57,7 +57,7 @@ ELSEIF(TARGET_X64)
|
||||||
SET(WINSDK8_SUFFIX "x64")
|
SET(WINSDK8_SUFFIX "x64")
|
||||||
SET(WINSDK_SUFFIXES "x64" "amd64")
|
SET(WINSDK_SUFFIXES "x64" "amd64")
|
||||||
ELSEIF(TARGET_X86)
|
ELSEIF(TARGET_X86)
|
||||||
SET(WINSDK8_SUFFIXES "x86")
|
SET(WINSDK8_SUFFIX "x86")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE})
|
SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE})
|
||||||
|
@ -310,9 +310,13 @@ SET(WINSDK_LIBRARY_DIRS
|
||||||
${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
|
${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
|
||||||
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX})
|
${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX})
|
||||||
|
|
||||||
|
IF(WINSDK_SUFFIXES)
|
||||||
FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
|
FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
|
||||||
SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
|
SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
|
ELSE()
|
||||||
|
SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
# directory where all libraries are found
|
# directory where all libraries are found
|
||||||
FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
|
FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
|
||||||
|
|
Loading…
Reference in a new issue