mirror of https://git.wownero.com/dsc/mxe.git
eigen: update 3.2.5 --> 3.3.7
This commit is contained in:
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")
|
15
src/eigen.mk
15
src/eigen.mk
|
@ -3,9 +3,9 @@
|
|||
PKG := eigen
|
||||
$(PKG)_WEBSITE := https://eigen.tuxfamily.org/
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 3.2.5
|
||||
$(PKG)_CHECKSUM := 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9
|
||||
$(PKG)_SUBDIR := $(PKG)-$(PKG)-bdd17ee3b1b3
|
||||
$(PKG)_VERSION := 3.3.7
|
||||
$(PKG)_CHECKSUM := 9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce
|
||||
$(PKG)_SUBDIR := $(PKG)-$(PKG)-323c052e1731
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_URL := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_DEPS := cc
|
||||
|
@ -18,13 +18,14 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && mkdir build && cd build && '$(TARGET)-cmake' .. \
|
||||
# build and install the library
|
||||
cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
|
||||
-DEIGEN_BUILD_PKGCONFIG=ON \
|
||||
-Drun_res=1 -Drun_res__TRYRUN_OUTPUT=""
|
||||
$(MAKE) -C '$(1)'/build -j '$(JOBS)' install VERBOSE=1
|
||||
-DBUILD_TESTING=OFF
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
|
||||
|
||||
'$(TARGET)-g++' -W -Wall '$(TEST_FILE)' -o \
|
||||
'$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
|
||||
`'$(TARGET)-pkg-config' --cflags --libs eigen3`
|
||||
endef
|
||||
|
||||
|
|
Loading…
Reference in New Issue