diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-01-23 21:56:46 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-01-23 21:56:46 +0100 |
| commit | d615d39af0c91661948b535b99af13a80a3d8a52 (patch) | |
| tree | af058ba20ecb653c04bdbb60d6366324c2b56cb8 /cmake/EigenDetermineOSVersion.cmake | |
| parent | 0d03492e1e6e70b8c835785bdb1a9b7720e09dd1 (diff) | |
determine windows version from major.minor only, the patch number is irrelevant.
Diffstat (limited to 'cmake/EigenDetermineOSVersion.cmake')
| -rw-r--r-- | cmake/EigenDetermineOSVersion.cmake | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/cmake/EigenDetermineOSVersion.cmake b/cmake/EigenDetermineOSVersion.cmake index 8d2251ec5..3c48d4c37 100644 --- a/cmake/EigenDetermineOSVersion.cmake +++ b/cmake/EigenDetermineOSVersion.cmake @@ -9,18 +9,18 @@ # - A little helper variable which should not be directly called function(DetermineShortWindowsName WIN_VERSION win_num_version) - if (${win_num_version} VERSION_EQUAL "6.1.7600") + if (${win_num_version} VERSION_EQUAL "6.1") set(_version "win7") - elseif(${win_num_version} VERSION_EQUAL "6.0.6000") + elseif(${win_num_version} VERSION_EQUAL "6.0") set(_version "winVista") - elseif(${win_num_version} VERSION_EQUAL "5.2.3790") + elseif(${win_num_version} VERSION_EQUAL "5.2") set(_version "winXpProf") - elseif(${win_num_version} VERSION_EQUAL "5.1.2600") + elseif(${win_num_version} VERSION_EQUAL "5.1") set(_version "winXp") - elseif(${win_num_version} VERSION_EQUAL "5.0.2195") + elseif(${win_num_version} VERSION_EQUAL "5.0") set(_version "win2000Prof") else() - set(_version "") + set(_version "unknownWin") endif() set(${WIN_VERSION} ${_version} PARENT_SCOPE) endfunction() @@ -28,16 +28,14 @@ endfunction() function(DetermineOSVersion OS_VERSION) if (WIN32) 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) string(REGEX MATCHALL "[0-9]+" ver_list "${ver_output}") list(GET ver_list 0 _major) list(GET ver_list 1 _minor) - list(GET ver_list 2 _patch) - set(win_num_version ${_major}.${_minor}.${_patch}) + set(win_num_version ${_major}.${_minor}) DetermineShortWindowsName(win_version "${win_num_version}") if(win_version) set(${OS_VERSION} ${win_version} PARENT_SCOPE) |