Merge upstream.

This commit is contained in:
Till Hoffmann 2016-04-04 19:16:48 +01:00
commit b0143de177

View File

@ -26,7 +26,7 @@ function(DetermineShortWindowsName WIN_VERSION win_num_version)
endfunction() endfunction()
function(DetermineOSVersion OS_VERSION) function(DetermineOSVersion OS_VERSION)
if (WIN32) if (WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
file (TO_NATIVE_PATH "$ENV{COMSPEC}" SHELL) file (TO_NATIVE_PATH "$ENV{COMSPEC}" SHELL)
exec_program( ${SHELL} ARGS "/c" "ver" OUTPUT_VARIABLE ver_output) exec_program( ${SHELL} ARGS "/c" "ver" OUTPUT_VARIABLE ver_output)