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

cmake: make doc more consistent

Browse Source
This commit is contained in:
Christoph Junghans
2020-09-08 09:43:21 -06:00
parent 09b8b117fc
commit 8fb13f4fd1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Modules/Packages/USER-MOLFILE.cmake
View File

@ -1,4 +1,5 @@
set(MOLFILE_INCLUDE_DIRS "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers") set(MOLFILE_INCLUDE_DIR "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")
set(MOLFILE_INCLUDE_DIRS "${MOLFILE_INCLUDE_DIR}")
add_library(molfile INTERFACE) add_library(molfile INTERFACE)
target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS}) target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS})
# no need to link with -ldl on windows # no need to link with -ldl on windows

6
doc/src/Build_extras.rst
View File

@ -73,7 +73,7 @@ If CMake cannot find the library, you can set these variables:
.. code-block:: bash .. code-block:: bash
-D ZLIB_INCLUDE_DIR=path # path to zlib.h header file -D ZLIB_INCLUDE_DIR=path # path to zlib.h header file
-D ZLIB_LIBRARIES=path # path to libz.a (.so) file -D ZLIB_LIBRARY=path # path to libz.a (.so) file
Traditional make Traditional make
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
@ -1370,11 +1370,11 @@ CMake build
.. code-block:: bash .. code-block:: bash
-D MOLFILE_INCLUDE_DIRS=path # (optional) path where VMD molfile plugin headers are installed -D MOLFILE_INCLUDE_DIR=path # (optional) path where VMD molfile plugin headers are installed
-D PKG_USER-MOLFILE=yes -D PKG_USER-MOLFILE=yes
Using "-D PKG_USER-MOLFILE=yes" enables the package, and setting Using "-D PKG_USER-MOLFILE=yes" enables the package, and setting
"-D MOLFILE_INCLUDE DIRS" allows to provide a custom location for "-D MOLFILE_INCLUDE DIR" allows to provide a custom location for
the molfile plugin header files. These should match the ABI of the the molfile plugin header files. These should match the ABI of the
plugin files used, and thus one typically sets them to include plugin files used, and thus one typically sets them to include
folder of the local VMD installation in use. LAMMPS ships with a folder of the local VMD installation in use. LAMMPS ships with a