blob: e392f5bde84a36c132a1d8badc3ce4fbc102ca2a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff -rupN eigen-3.1.2/eigen-eigen-ffa86ffb5570/cmake/EigenDetermineOSVersion.cmake eigen-3.1.2-new/eigen-eigen-ffa86ffb5570/cmake/EigenDetermineOSVersion.cmake
--- eigen-3.1.2/eigen-eigen-ffa86ffb5570/cmake/EigenDetermineOSVersion.cmake 2012-11-05 22:22:49.000000000 +0100
+++ eigen-3.1.2-new/eigen-eigen-ffa86ffb5570/cmake/EigenDetermineOSVersion.cmake 2013-03-01 23:03:26.732533050 +0100
@@ -26,21 +26,5 @@ function(DetermineShortWindowsName WIN_V
endfunction()
function(DetermineOSVersion OS_VERSION)
- if (WIN32)
- file (TO_NATIVE_PATH "$ENV{COMSPEC}" SHELL)
- 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)
-
- set(win_num_version ${_major}.${_minor})
- DetermineShortWindowsName(win_version "${win_num_version}")
- if(win_version)
- set(${OS_VERSION} ${win_version} PARENT_SCOPE)
- endif()
- else()
- set(${OS_VERSION} ${CMAKE_SYSTEM} PARENT_SCOPE)
- endif()
+ set(${OS_VERSION} ${CMAKE_SYSTEM} PARENT_SCOPE)
endfunction()
|