Merge pull request #1721 from akohlmey/fix-compiler-warnings (873e0142) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,8 @@ endif()
		option(DISABLE_CXX11_REQUIREMENT "Disable check that requires C++11 for compiling LAMMPS" OFF)
		if(DISABLE_CXX11_REQUIREMENT)
		add_definitions(-DLAMMPS_CXX98)
		else()
		set(CMAKE_CXX_STANDARD 11)
		# else()
		# set(CMAKE_CXX_STANDARD 11)
		endif()

		# GNU compiler features
		@@ -248,6 +248,7 @@ if(BUILD_OMP)
		endif()

		if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
		enable_language(C)
		find_package(LAPACK)
		find_package(BLAS)
		if(NOT LAPACK_FOUND OR NOT BLAS_FOUND)

+3 −0

Original line number	Diff line number	Diff line
		if(PKG_MESSAGE)
		if(LAMMPS_SIZES STREQUAL BIGBIG)
		message(FATAL_ERROR "The MESSAGE Package is not compatible with -DLAMMPS_BIGBIG")
		endif()
		option(MESSAGE_ZMQ "Use ZeroMQ in MESSAGE package" OFF)
		file(GLOB_RECURSE cslib_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/[^.]*.F
		${LAMMPS_LIB_SOURCE_DIR}/message/cslib/[^.]*.c

+4 −0

Original line number	Diff line number	Diff line
		if(PKG_USER-MOLFILE)
		if (CMAKE_VERSION VERSION_LESS "3.10") # due to INTERFACE without a library
		message(FATAL_ERROR "For configuring USER-MOLFILE you need CMake 3.10 or later")
		endif()

		set(MOLFILE_INCLUDE_DIRS "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")
		add_library(molfile INTERFACE)
		target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS})

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ if(PKG_USER-PLUMED)
		message(STATUS "PLUMED download requested - we will build our own")
		include(ExternalProject)
		ExternalProject_Add(plumed_build
		URL https://github.com/plumed/plumed2/releases/download/v2.5.2/plumed-src-2.5.2.tgz
		URL_MD5 bd2f18346c788eb54e1e52f4f6acf41a
		URL https://github.com/plumed/plumed2/releases/download/v2.5.3/plumed-src-2.5.3.tgz
		URL_MD5 de30d6e7c2dcc0973298e24a6da24286
		BUILD_IN_SOURCE 1
		CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
		${CONFIGURE_REQUEST_PIC}

+26 −0

Original line number	Diff line number	Diff line
		@@ -1798,6 +1798,32 @@ Requires installation of the Voro++ library
		</tbody>
		</table>

		### USER-COLVARS Package

		Requires a C++11 compiler to compile with the Lepton library included.

		<table>
		<thead>
		<tr>
		<th>Option</th>
		<th>Description</th>
		<th>Values</th>
		</tr>
		</thead>
		<tbody>
		<tr>
		<td><code>COLVARS_LEPTON</code></td>
		<td>Enable the use of the Lepton library inside the Colvars library.
		<td>
		<dl>
		<dt><code>on</code> (default)</dt>
		<dt><code>off</code></dt>
		</dl>
		</td>
		</tr>
		</tbody>
		</table>

		### USER-LATTE Package

		Requires installation of the LATTE library