Merge pull request #2111 from akohlmey/collected-small-changes (69b86351) · Commits · 郑智淋 / lammps

doc/src/Build_cmake.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ re-compile and relink the LAMMPS executable with ``cmake --build .`` (or
		``cmake .`` and then compile again. The included dependency tracking
		should make certain that only the necessary subset of files are
		re-compiled. You can also delete compiled objects, libraries and
		executables with ``cmake --build . clean`` (or ``make clean``).
		executables with ``cmake --build . --target clean`` (or ``make clean``).

		After compilation, you may optionally install the LAMMPS executable into
		your system with:

+5 −3

Original line number	Diff line number	Diff line
		@@ -415,8 +415,10 @@ This is particularly convenient, if you have set a custom build command
		via the ``CMAKE_MAKE_PROGRAM`` variable.

		When calling the build program, you can also select which "target" is to
		be build through appending the name of the target to the build command.
		Example: ``cmake --build . all``. The following abstract targets are available:
		be build through appending the ``--target`` flag and the name of the target
		to the build command. When using ``make`` as build tool, you can just append
		the target name to the command. Example: ``cmake --build . --target all`` or
		``make all``. The following abstract targets are available:

		.. list-table::
		:header-rows: 1
		@@ -432,7 +434,7 @@ Example: ``cmake --build . all``. The following abstract targets are available:
		* - ``install``
		- install all target files into folders in ``CMAKE_INSTALL_PREFIX``
		* - ``test``
		- run some simple tests (if configured with ``-D ENABLE_TESTING=on``)
		- run some tests (if configured with ``-D ENABLE_TESTING=on``)
		* - ``clean``
		- remove all generated files

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ $(EXE): main.o $(LMPLIB) $(EXTRA_LINK_DEPENDS)
		# Library targets

		$(ARLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)
		@rm -f ../$(ARLIB)
		$(ARCHIVE) $(ARFLAGS) ../$(ARLIB) $(OBJ)
		@rm -f $(ARLIB)
		@ln -s ../$(ARLIB) $(ARLIB)

+1 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ $(EXE): main.o $(LMPLIB) $(EXTRA_LINK_DEPENDS)
		# Library targets

		$(ARLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)
		@rm -f ../$(ARLIB)
		$(ARCHIVE) $(ARFLAGS) ../$(ARLIB) $(OBJ)
		@rm -f $(ARLIB)
		@ln -s ../$(ARLIB) $(ARLIB)

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ $(EXE): main.o $(LMPLIB) $(EXTRA_LINK_DEPENDS)
		# Library targets

		$(ARLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)
		@rm -f ../$(ARLIB)
		$(ARCHIVE) $(ARFLAGS) ../$(ARLIB) $(OBJ)
		@rm -f $(ARLIB)
		@ln -s ../$(ARLIB) $(ARLIB)