ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eigen3 is now hosted at GitLab. The bitbucket repo is gone. Update URLs and MD5s

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-08-18 21:29:43 -04:00
parent 43f6fa4b29
commit f7c6e8e6b1
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Modules/Packages/USER-SMD.cmake
View File

@ -9,8 +9,8 @@ if(DOWNLOAD_EIGEN3)
message(STATUS "Eigen3 download requested - we will build our own") message(STATUS "Eigen3 download requested - we will build our own")
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(Eigen3_build ExternalProject_Add(Eigen3_build
URL https://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz URL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz
URL_MD5 f2a417d083fe8ca4b8ed2bc613d20f07 URL_MD5 9e30f67e8531477de4117506fe44669b
CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
) )
ExternalProject_get_property(Eigen3_build SOURCE_DIR) ExternalProject_get_property(Eigen3_build SOURCE_DIR)

16
lib/smd/Install.py
View File

@ -22,12 +22,10 @@ tarball = "eigen.tar.gz"
# known checksums for different Eigen versions. used to validate the download. # known checksums for different Eigen versions. used to validate the download.
checksums = { \ checksums = { \
'3.3.4' : '1a47e78efe365a97de0c022d127607c3', \ '3.3.7' : '9e30f67e8531477de4117506fe44669b' \
'3.3.5' : 'ee48cafede2f51fe33984ff5c9f48026', \
'3.3.6' : 'd1be14064b50310b0eb2b49e402c64d7', \
'3.3.7' : 'f2a417d083fe8ca4b8ed2bc613d20f07' \
} }
# help message # help message
HELP = """ HELP = """
@ -36,7 +34,7 @@ Syntax from src dir: make lib-smd args="-b"
Syntax from lib dir: python Install.py -b Syntax from lib dir: python Install.py -b
or: python Install.py -p /usr/include/eigen3" or: python Install.py -p /usr/include/eigen3"
or: python Install.py -v 3.3.4 -b or: python Install.py -v 3.3.7 -b
Example: Example:
@ -78,7 +76,7 @@ if pathflag:
if buildflag: if buildflag:
print("Downloading Eigen ...") print("Downloading Eigen ...")
eigentar = os.path.join(homepath, tarball) eigentar = os.path.join(homepath, tarball)
url = "https://bitbucket.org/eigen/eigen/get/%s.tar.gz" % version url = "https://gitlab.com/libeigen/eigen/-/archive/%s/eigen-%s.tar.gz" % (version,version)
geturl(url, eigentar) geturl(url, eigentar)
# verify downloaded archive integrity via md5 checksum, if known. # verify downloaded archive integrity via md5 checksum, if known.
@ -89,7 +87,7 @@ if buildflag:
print("Cleaning up old folders ...") print("Cleaning up old folders ...")
edir = glob.glob(os.path.join(homepath, "eigen-eigen-*")) edir = glob.glob(os.path.join(homepath, "eigen-*"))
edir.append(eigenpath) edir.append(eigenpath)
for one in edir: for one in edir:
if os.path.isdir(one): if os.path.isdir(one):
@ -102,8 +100,8 @@ if buildflag:
os.remove(eigentar) os.remove(eigentar)
else: else:
sys.exit("File %s is not a supported archive" % eigentar) sys.exit("File %s is not a supported archive" % eigentar)
edir = glob.glob(os.path.join(homepath, "eigen-eigen-*")) edir = os.path.join(homepath, "eigen-%s" % version)
os.rename(edir[0], eigenpath) os.rename(edir, eigenpath)
# create link in lib/smd to Eigen src dir # create link in lib/smd to Eigen src dir