Unverified Commit 63c46a36 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into progguide

parents 27d11d9a 2a6546d6

cmake/Modules/GTest.cmake

+4 −2
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ else() 
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}

cmake/Modules/Packages/USER-SMD.cmake

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ if(DOWNLOAD_EIGEN3) 
  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)

doc/lammps.1

+1 −1
Original line number Diff line number Diff line 
.TH LAMMPS "21 July 2020" "2020-07-21"

.TH LAMMPS "21 August 2020" "2020-08-21"

.SH NAME

.B LAMMPS

\- Molecular Dynamics Simulator.

doc/src/Commands_fix.rst

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ OPT. 
   * :doc:`manifoldforce <fix_manifoldforce>`

   * :doc:`meso/move <fix_meso_move>`

   * :doc:`momentum (k) <fix_momentum>`

   * :doc:`momentum/chunk <fix_momentum>`

   * :doc:`move <fix_move>`

   * :doc:`mscg <fix_mscg>`

   * :doc:`msst <fix_msst>`

doc/src/bond_none.rst

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Syntax 
Examples

""""""""



.. code-blocK:: LAMMPS

.. code-block:: LAMMPS



   bond_style none

CRA Git | Maintained and supported by SUSTech CRA and CCSE