Merge pull request #1932 from akohlmey/atc-doc-to-rst (68dc62c5) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+3 −3

Changes for cmake/CMakeLists.txt: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -262,8 +262,8 @@ if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
		enable_language(Fortran)
		file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.[fF])
		add_library(linalg STATIC ${LAPACK_SOURCES})
		set(BLAS_LIBRARIES "${CMAKE_BINARY_DIR}/liblinalg.a")
		set(LAPACK_LIBRARIES "${CMAKE_BINARY_DIR}/liblinalg.a")
		set(BLAS_LIBRARIES "$<TARGET_FILE:linalg>")
		set(LAPACK_LIBRARIES "$<TARGET_FILE:linalg>")
		else()
		list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
		endif()
		@@ -344,7 +344,7 @@ include(Packages/COMPRESS)

		set(CMAKE_TUNE_FLAGS "${CMAKE_TUNE_DEFAULT}" CACHE STRING "Compiler specific optimization or instrumentation")
		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_TUNE_FLAGS}")
		if(CMAKE_Fortran_FLAGS)
		if(CMAKE_Fortran_COMPILER)
		set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${CMAKE_TUNE_FLAGS}")
		endif()
		########################################################################

+2 −1

Changes for cmake/presets/mingw-cross.cmake: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ endif()
		set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)
		set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE)
		set(LAMMPS_MEMALIGN "0" CACHE STRING "" FORCE)
		set(CMAKE_TUNE_FLAGS "" CACHE STRING "" FORCE)
		set(CMAKE_TUNE_FLAGS "-Wno-missing-include-dirs" CACHE STRING "" FORCE)
		set(CMAKE_EXE_LINKER_FLAGS "--enable-stdcall-fixup" CACHE STRING "" FORCE)
		set(BUILD_TOOLS ON CACHE BOOL "" FORCE)
		set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lammps-installer")

+0 −8

Changes for doc/Makefile: 0 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -76,13 +76,9 @@ html: $(ANCHORCHECK) $(MATHJAX)
		@rm -rf html/USER
		@rm -rf html/JPG
		@cp -r src/PDF html/PDF
		@cp -r src/USER html/USER
		@mkdir -p html/JPG
		@cp `grep -A2 '\.\. .image::' src/.rst \| grep ':target:' \| sed -e 's,.*:target: JPG/,src/JPG/,' \| sort \| uniq` html/JPG/
		@rm -rf html/PDF/.[sg]*
		@rm -rf html/USER/.[sg]*
		@rm -rf html/USER//.[sg]
		@rm -rf html/USER//.[sg]*
		@mkdir -p html/_static/mathjax
		@cp -r $(MATHJAX)/es5 html/_static/mathjax/
		@echo "Build finished. The HTML pages are in doc/html."
		@@ -151,11 +147,7 @@ pdf: $(ANCHORCHECK)
		@rm -rf latex/PDF
		@rm -rf latex/USER
		@cp -r src/PDF latex/PDF
		@cp -r src/USER latex/USER
		@rm -rf latex/PDF/.[sg]*
		@rm -rf latex/USER/.[sg]*
		@rm -rf latex/USER//.[sg]
		@rm -rf latex/USER//.[sg]*
		@echo "Build finished. Manual.pdf and Developer.pdf are in this directory."

		fetch:

+1 −1

Changes for doc/src/Build_cmake.rst: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ platforms and particularly on Linux. However, alternate build tools
		(e.g. Ninja) and project files for Integrated Development Environments
		(IDEs) like Eclipse, CodeBlocks, or Kate can be generated, too. This is
		selected via the ``-G`` command line flag. Further details about features
		and settings for CMake are in the `CMake online documentation <cmake_doc>`_
		and settings for CMake are in the `CMake online documentation <cmake_doc_>`_

		.. _cmake_doc: https://cmake.org/documentation/

+3 −1

Changes for doc/src/Build_link.rst: 3 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -240,9 +240,11 @@ C-style interface, provided in src/library.cpp and src/library.h.

		See the :doc:`Python library <Python_library>` doc page for a
		description of the Python interface to LAMMPS, which wraps the C-style
		interface from a shared library through the ctypes python module.
		interface from a shared library through the `ctypes python module <ctypes_>`_.

		See the sample codes in examples/COUPLE/simple for examples of C++ and
		C and Fortran codes that invoke LAMMPS through its library interface.
		Other examples in the COUPLE directory use coupling ideas discussed on
		the :doc:`Howto couple <Howto_couple>` doc page.

		.. _ctypes: https://docs.python.org/3/library/ctypes.html