Merge branch 'master' into colvars-update (d8f540a4) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -819,7 +819,7 @@ foreach(SIMPLE_LIB REAX MEAM POEMS USER-ATC USER-AWPMD USER-COLVARS USER-H5MD
		if(PKG_LIB STREQUAL awpmd)
		target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
		elseif(PKG_LIB STREQUAL h5md)
		target_include_directories(h5md PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/h5md/include)
		target_include_directories(h5md PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/h5md/include ${HDF5_INCLUDE_DIRS})
		elseif(PKG_LIB STREQUAL colvars)
		target_compile_options(colvars PRIVATE -DLEPTON)
		target_include_directories(colvars PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/colvars/lepton/include)
		@@ -842,6 +842,7 @@ if(PKG_USER-H5MD)
		find_package(HDF5 REQUIRED)
		target_link_libraries(h5md ${HDF5_LIBRARIES})
		target_include_directories(h5md PRIVATE ${HDF5_INCLUDE_DIRS})
		include_directories(${HDF5_INCLUDE_DIRS})
		endif()