diff -Naur lammps-21Jul20/cmake/CMakeLists.txt lammps-24Aug20/cmake/CMakeLists.txt --- lammps-21Jul20/cmake/CMakeLists.txt 2020-07-21 08:52:10.000000000 -0600 +++ lammps-24Aug20/cmake/CMakeLists.txt 2020-08-24 13:01:30.289411599 -0600 @@ -747,6 +747,12 @@ endif() message(STATUS "<<< Linker flags: >>>") message(STATUS "Executable name: ${LAMMPS_BINARY}") +if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) + get_target_property(OPTIONS lammps LINK_OPTIONS) + if(OPTIONS) + message(STATUS "Linker options: ${OPTIONS}") + endif() +endif() if(CMAKE_EXE_LINKER_FLAGS) message(STATUS "Executable linker flags: ${CMAKE_EXE_LINKER_FLAGS}") endif() diff -Naur lammps-21Jul20/cmake/Modules/Documentation.cmake lammps-24Aug20/cmake/Modules/Documentation.cmake --- lammps-21Jul20/cmake/Modules/Documentation.cmake 2020-07-21 08:52:10.000000000 -0600 +++ lammps-24Aug20/cmake/Modules/Documentation.cmake 2020-08-24 13:01:30.268411081 -0600 @@ -29,8 +29,8 @@ OUTPUT requirements.txt DEPENDS docenv COMMAND ${CMAKE_COMMAND} -E copy ${LAMMPS_DOC_DIR}/utils/requirements.txt requirements.txt - COMMAND ${DOCENV_BINARY_DIR}/pip install -r requirements.txt --upgrade COMMAND ${DOCENV_BINARY_DIR}/pip install --upgrade ${LAMMPS_DOC_DIR}/utils/converters + COMMAND ${DOCENV_BINARY_DIR}/pip install --use-feature=2020-resolver -r requirements.txt --upgrade ) # download mathjax distribution and unpack to folder "mathjax" diff -Naur lammps-21Jul20/cmake/Modules/GTest.cmake lammps-24Aug20/cmake/Modules/GTest.cmake --- lammps-21Jul20/cmake/Modules/GTest.cmake 2020-07-21 08:52:10.000000000 -0600 +++ lammps-24Aug20/cmake/Modules/GTest.cmake 2020-08-24 13:01:30.276411278 -0600 @@ -7,9 +7,11 @@ endif() include(ExternalProject) +set(GTEST_URL "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" CACHE STRING "URL for GTest tarball") +mark_as_advanced(GTEST_URL) ExternalProject_Add(googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 + URL ${GTEST_URL} + URL_MD5 ecd1fa65e7de707cd5c00bdac56022cd SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build" CMAKE_ARGS ${CMAKE_REQUEST_PIC} ${CMAKE_EXTRA_GTEST_OPTS} diff -Naur lammps-21Jul20/cmake/Modules/Packages/USER-SMD.cmake lammps-24Aug20/cmake/Modules/Packages/USER-SMD.cmake --- lammps-21Jul20/cmake/Modules/Packages/USER-SMD.cmake 2020-07-21 08:52:10.000000000 -0600 +++ lammps-24Aug20/cmake/Modules/Packages/USER-SMD.cmake 2020-08-24 13:01:30.274411229 -0600 @@ -9,8 +9,8 @@ message(STATUS "Eigen3 download requested - we will build our own") include(ExternalProject) ExternalProject_Add(Eigen3_build - URL https://bitbucket.org/eigen/eigen/get/3.3.7.tar.gz - URL_MD5 f2a417d083fe8ca4b8ed2bc613d20f07 + URL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz + URL_MD5 9e30f67e8531477de4117506fe44669b CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" ) ExternalProject_get_property(Eigen3_build SOURCE_DIR) diff -Naur lammps-21Jul20/cmake/Modules/Testing.cmake lammps-24Aug20/cmake/Modules/Testing.cmake --- lammps-21Jul20/cmake/Modules/Testing.cmake 2020-07-21 08:52:10.000000000 -0600 +++ lammps-24Aug20/cmake/Modules/Testing.cmake 2020-08-24 13:01:30.278411328 -0600 @@ -16,6 +16,36 @@ set(MEMORYCHECK_COMMAND "${VALGRIND_BINARY}" CACHE FILEPATH "Memory Check Command") set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_DEFAULT_OPTIONS}" CACHE STRING "Memory Check Command Options") + # check if a faster linker is available. + # only verified with GNU and Clang compilers and new CMake + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) + if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") + OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")) + include(CheckCXXCompilerFlag) + set(CMAKE_CUSTOM_LINKER_DEFAULT default) + check_cxx_compiler_flag(-fuse-ld=lld HAVE_LLD_LINKER_FLAG) + check_cxx_compiler_flag(-fuse-ld=gold HAVE_GOLD_LINKER_FLAG) + check_cxx_compiler_flag(-fuse-ld=bfd HAVE_BFD_LINKER_FLAG) + find_program(HAVE_LLD_LINKER_BIN lld ld.lld) + find_program(HAVE_GOLD_LINKER_BIN ld.gold) + find_program(HAVE_BFD_LINKER_BIN ld.bfd) + if(HAVE_LLD_LINKER_FLAG AND HAVE_LLD_LINKER_BIN) + set(CMAKE_CUSTOM_LINKER_DEFAULT lld) + elseif(HAVE_GOLD_LINKER_FLAG AND HAVE_GOLD_LINKER_BIN) + set(CMAKE_CUSTOM_LINKER_DEFAULT gold) + elseif(HAVE_BFD_LINKER_FLAG AND HAVE_BFD_LINKER_BIN) + set(CMAKE_CUSTOM_LINKER_DEFAULT bfd) + endif() + set(CMAKE_CUSTOM_LINKER_VALUES lld gold bfd default) + set(CMAKE_CUSTOM_LINKER ${CMAKE_CUSTOM_LINKER_DEFAULT} CACHE STRING "Choose a custom linker for faster linking (lld, gold, bfd, default)") + validate_option(CMAKE_CUSTOM_LINKER CMAKE_CUSTOM_LINKER_VALUES) + mark_as_advanced(CMAKE_CUSTOM_LINKER) + if(NOT "${CMAKE_CUSTOM_LINKER}" STREQUAL "default") + target_link_options(lammps PUBLIC -fuse-ld=${CMAKE_CUSTOM_LINKER}) + endif() + endif() + endif() + include(CTest) enable_testing() diff -Naur lammps-21Jul20/doc/Makefile lammps-24Aug20/doc/Makefile --- lammps-21Jul20/doc/Makefile 2020-07-21 08:52:10.000000000 -0600 +++ lammps-24Aug20/doc/Makefile 2020-08-24 13:01:30.633420097 -0600 @@ -83,7 +83,7 @@ @rm -rf html/JPG @cp -r src/PDF html/PDF @mkdir -p html/JPG - @cp `grep -A2 '\.\. .*\(image\|figure\)::' src/*.rst | grep ':target:' | sed -e 's,.*:target: JPG/,src/JPG/,' | sort | uniq` html/JPG/ + @cp `grep -A2 '\.\. .*\(image\|figure\)::' src/*.rst | grep ':target: JPG' | sed -e 's,.*:target: JPG/,src/JPG/,' | sort | uniq` html/JPG/ @rm -rf html/PDF/.[sg]* @mkdir -p html/_static/mathjax @cp -r $(MATHJAX)/es5 html/_static/mathjax/ @@ -194,9 +194,7 @@ $(VIRTUALENV) -p $(PYTHON) $(VENV); \ . $(VENV)/bin/activate; \ pip install --upgrade pip; \ - pip install Sphinx; \ - pip install sphinxcontrib-spelling ;\ - pip install breathe; \ + pip install --use-feature=2020-resolver -r requirements.txt; \ deactivate;\ ) diff -Naur lammps-21Jul20/doc/html/.buildinfo lammps-24Aug20/doc/html/.buildinfo --- lammps-21Jul20/doc/html/.buildinfo 2020-07-21 08:54:29.000000000 -0600 +++ lammps-24Aug20/doc/html/.buildinfo 2020-08-24 13:03:40.980639764 -0600 @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 3bd475fc0bbe2fa3f981fede56bd6795 +config: 63f47ee7a545361bdf7329df34c8ffef tags: 645f666f9bcd5a90fca523b33c5a78b7 diff -Naur lammps-21Jul20/doc/html/Build.html lammps-24Aug20/doc/html/Build.html --- lammps-21Jul20/doc/html/Build.html 2020-07-21 08:54:29.000000000 -0600 +++ lammps-24Aug20/doc/html/Build.html 2020-08-24 13:03:40.549629118 -0600 @@ -1,8 +1,7 @@ - - + @@ -12,58 +11,67 @@ - - - - - - - - - + + + - - - - - - - - + - + + + + + + + + + + + + + + - + +
-
-