Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/FindWindowsSDK.cmake

@@ -57,7 +57,7 @@ ELSEIF(TARGET_X64)
   SET(WINSDK8_SUFFIX "x64")
   SET(WINSDK_SUFFIXES "x64" "amd64")
 ELSEIF(TARGET_X86)
-  SET(WINSDK8_SUFFIXES "x86")
+  SET(WINSDK8_SUFFIX "x86")
 ENDIF()
 
 SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE})
@@ -90,7 +90,7 @@ MACRO(FIND_WINSDK_VERSION_HEADERS)
           SET(WINSDK_VERSION "8.1")
         ENDIF()
       ENDIF()
-      
+
       IF(NOT WINSDK_VERSION)
         # Look for Windows SDK 8.0
         FILE(STRINGS ${_MSI_FILE} _CONTENT REGEX "^#ifndef NTDDI_WIN8")
@@ -99,11 +99,11 @@ MACRO(FIND_WINSDK_VERSION_HEADERS)
           SET(WINSDK_VERSION "8.0")
         ENDIF()
       ENDIF()
-      
+
       IF(NOT WINSDK_VERSION)
         # Look for Windows SDK 7.0
         FILE(STRINGS ${_MSI_FILE} _CONTENT REGEX "^#ifndef NTDDI_WIN7")
-        
+
         IF(_CONTENT)
           FIND_FILE(_WINSDKVER_FILE winsdkver.h WinSDKVer.h
             PATHS
@@ -135,7 +135,7 @@ MACRO(FIND_WINSDK_VERSION_HEADERS)
       IF(NOT WINSDK_VERSION)
         # Look for Windows SDK 6.0
         FILE(STRINGS ${_MSI_FILE} _CONTENT REGEX "^#ifndef NTDDI_VISTA")
-        
+
         IF(_CONTENT)
           SET(WINSDK_VERSION "6.0")
         ENDIF()
@@ -310,9 +310,13 @@ SET(WINSDK_LIBRARY_DIRS
   ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
   ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX})
 
-FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
-  SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
-ENDFOREACH()
+IF(WINSDK_SUFFIXES)
+  FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
+    SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
+  ENDFOREACH()
+ELSE()
+  SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib)
+ENDIF()
 
 # directory where all libraries are found
 FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib