Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-14305: Upgrade Eigen to 3.3.4 #5

Merged
merged 2 commits into from
Jul 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions patches/fixCMakeNoFortran.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# HG changeset patch
# User Gael Guennebaud <g.gael@free.fr>
# Date 1523083519 -7200
# Branch 3.3
# Node ID ba14974d054ae9ae4ba88e5e58012fa6c2729c32
# Parent 8be258ef0b6d09f1c331851c708e5da1429c5c36
Fix cmake scripts with no fortran compiler
(grafted from 607df2a0aa39feecb4334a1a7bd9d07d858598dc)

diff --git a/cmake/language_support.cmake b/cmake/language_support.cmake
--- a/cmake/language_support.cmake
+++ b/cmake/language_support.cmake
@@ -26,7 +26,7 @@
cmake_minimum_required(VERSION 2.8.0)
set (CMAKE_Fortran_FLAGS \"${CMAKE_Fortran_FLAGS}\")
set (CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS}\")
- enable_language(${language} OPTIONAL)
+ enable_language(${language})
")
file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/language_tests/${language})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language})
19 changes: 19 additions & 0 deletions patches/setCMakeFortranCompiler.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# HG changeset patch
# User Christoph Hertzberg <chtz@informatik.uni-bremen.de>
# Date 1497970683 -7200
# Node ID dbab66d00651bf050d1426334a39b627abe7216e
# Parent 0cb43994733f413565eb6dbe1495d5ec2694436f
Make sure CMAKE_Fortran_COMPILER is set before checking for Fortran functions

diff --git a/cmake/FindBLAS.cmake b/cmake/FindBLAS.cmake
--- a/cmake/FindBLAS.cmake
+++ b/cmake/FindBLAS.cmake
@@ -152,7 +152,7 @@

# Check the language being used
get_property( _LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES )
-if( _LANGUAGES_ MATCHES Fortran )
+if( _LANGUAGES_ MATCHES Fortran AND CMAKE_Fortran_COMPILER)
set( _CHECK_FORTRAN TRUE )
elseif( (_LANGUAGES_ MATCHES C) OR (_LANGUAGES_ MATCHES CXX) )
set( _CHECK_FORTRAN FALSE )
Binary file removed upstream/eigen-3.2.10.tar.gz
Binary file not shown.
Binary file added upstream/eigen-3.3.4.tar.gz
Binary file not shown.