mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-04 05:54:32 +00:00 
			
		
		
		
	more build system cleaning and patch for bad include in Eigen
This commit is contained in:
		@@ -3,7 +3,12 @@
 | 
				
			|||||||
EIGEN_URL='http://bitbucket.org/eigen/eigen/get/3.3.5.tar.bz2'
 | 
					EIGEN_URL='http://bitbucket.org/eigen/eigen/get/3.3.5.tar.bz2'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "-- deploying Eigen source..."
 | 
					echo "-- deploying Eigen source..."
 | 
				
			||||||
wget ${EIGEN_URL} --no-check-certificate && ./scripts/update_eigen.sh `basename ${EIGEN_URL}` && rm `basename ${EIGEN_URL}`
 | 
					ARC=`basename ${EIGEN_URL}`
 | 
				
			||||||
 | 
					wget ${EIGEN_URL} --no-check-certificate && ./scripts/update_eigen.sh ${ARC} && rm ${ARC}
 | 
				
			||||||
 | 
					# patch for non-portable includes in Eigen 3.3.5
 | 
				
			||||||
 | 
					# apparently already fixed in Eigen HEAD so it should not be 
 | 
				
			||||||
 | 
					# a problem in the future (A.P.)
 | 
				
			||||||
 | 
					patch Grid/Eigen/unsupported/CXX11/Tensor scripts/eigen-3.3.5.Tensor.patch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo '-- generating Make.inc files...'
 | 
					echo '-- generating Make.inc files...'
 | 
				
			||||||
./scripts/filelist
 | 
					./scripts/filelist
 | 
				
			||||||
 
 | 
				
			|||||||
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										19
									
								
								scripts/eigen-3.3.5.Tensor.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								scripts/eigen-3.3.5.Tensor.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,19 @@
 | 
				
			|||||||
 | 
					--- ./Eigen/unsupported/Eigen/CXX11/Tensor	2018-07-23 10:33:42.000000000 +0100
 | 
				
			||||||
 | 
					+++ Tensor	2018-08-28 16:15:56.000000000 +0100
 | 
				
			||||||
 | 
					@@ -25,7 +25,7 @@
 | 
				
			||||||
 | 
					 #include <utility>
 | 
				
			||||||
 | 
					 #endif
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-#include <Eigen/src/Core/util/DisableStupidWarnings.h>
 | 
				
			||||||
 | 
					+#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h"
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 #include "../SpecialFunctions"
 | 
				
			||||||
 | 
					 #include "src/util/CXX11Meta.h"
 | 
				
			||||||
 | 
					@@ -147,6 +147,6 @@
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 #include "src/Tensor/TensorIO.h"
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-#include <Eigen/src/Core/util/ReenableStupidWarnings.h>
 | 
				
			||||||
 | 
					+#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h"
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 //#endif // EIGEN_CXX11_TENSOR_MODULE
 | 
				
			||||||
		Reference in New Issue
	
	Block a user