parent
0e61c36c46
commit
1df09125a6
@ -1,25 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
--- a/cmake/EigenDetermineOSVersion.cmake 2012-12-05 16:53:46.305932163 +0100
|
||||
+++ b/cmake/EigenDetermineOSVersion.cmake 2012-12-05 16:56:15.937936644 +0100
|
||||
@@ -27,19 +27,7 @@
|
||||
|
||||
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()
|
||||
+ set(${OS_VERSION} "unknownWin" PARENT_SCOPE)
|
||||
else()
|
||||
set(${OS_VERSION} ${CMAKE_SYSTEM} PARENT_SCOPE)
|
||||
endif()
|
@ -1,13 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
--- a/cmake/EigenTesting.cmake
|
||||
+++ b/cmake/EigenTesting.cmake
|
||||
@@ -324,7 +324,7 @@
|
||||
# on all other system we rely on ${CMAKE_CXX_COMPILER}
|
||||
# supporting a "--version" or "/version" flag
|
||||
|
||||
- if(WIN32 AND NOT CYGWIN)
|
||||
+ if(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_GNUCC)
|
||||
set(EIGEN_CXX_FLAG_VERSION "/version")
|
||||
else()
|
||||
set(EIGEN_CXX_FLAG_VERSION "--version")
|
Loading…
Reference in new issue