Merge pull request #2027 from junghans/cmake_clean_up_plumed (d4c06a2e) · Commits · 郑智淋 / lammps

cmake/Modules/Packages/USER-PLUMED.cmake

+2 −4

Original line number	Diff line number	Diff line
		@@ -74,12 +74,11 @@ if(DOWNLOAD_PLUMED)
		install(CODE "MESSAGE(FATAL_ERROR \"Installing liblammps with downloaded libraries is currently not supported.\")")
		endif()
		if(PLUMED_MODE STREQUAL "STATIC")
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_WRAPPER_CXX=1")
		set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumed.a INTERFACE_LINK_LIBRARIES "${PLUMED_LINK_LIBS};${CMAKE_DL_LIBS}")
		elseif(PLUMED_MODE STREQUAL "SHARED")
		set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX} INTERFACE_LINK_LIBRARIES "${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX};${CMAKE_DL_LIBS}")
		elseif(PLUMED_MODE STREQUAL "RUNTIME")
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_HAS_DLOPEN=1;__PLUMED_DEFAULT_KERNEL=${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_DEFAULT_KERNEL=${INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
		set_target_properties(LAMMPS::PLUMED PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/libplumedWrapper.a INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS}")
		endif()
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
		@@ -89,12 +88,11 @@ else()
		pkg_check_modules(PLUMED REQUIRED plumed)
		add_library(LAMMPS::PLUMED INTERFACE IMPORTED)
		if(PLUMED_MODE STREQUAL "STATIC")
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_WRAPPER_CXX=1")
		include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.static)
		elseif(PLUMED_MODE STREQUAL "SHARED")
		include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.shared)
		elseif(PLUMED_MODE STREQUAL "RUNTIME")
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_HAS_DLOPEN=1;__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
		include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.runtime)
		endif()
		set_target_properties(LAMMPS::PLUMED PROPERTIES INTERFACE_LINK_LIBRARIES "${PLUMED_LOAD}")

lib/plumed/Makefile.lammps.runtime

+1 −1

Original line number	Diff line number	Diff line
		# Settings that the LAMMPS build will import when this package library is used

		plumed_SYSINC = -D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=$(PLUMED_LIBDIR)/libplumedKernel.so
		plumed_SYSINC = -D__PLUMED_DEFAULT_KERNEL=$(PLUMED_LIBDIR)/libplumedKernel.so
		plumed_SYSLIB = $(PLUMED_LOAD) -rdynamic
		plumed_SYSPATH =

lib/plumed/Makefile.lammps.runtime.macosx

+1 −1

Original line number	Diff line number	Diff line
		# Settings that the LAMMPS build will import when this package library is used

		plumed_SYSINC = -D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=$(PLUMED_LIBDIR)/libplumedKernel.dylib
		plumed_SYSINC = -D__PLUMED_DEFAULT_KERNEL=$(PLUMED_LIBDIR)/libplumedKernel.dylib
		plumed_SYSLIB = $(PLUMED_LOAD) -rdynamic
		plumed_SYSPATH =

lib/plumed/Makefile.lammps.static

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,6 @@

		# Use statically linked C++ interface to plumed

		plumed_SYSINC = -D__PLUMED_WRAPPER_CXX=1
		plumed_SYSINC =
		plumed_SYSLIB = $(PLUMED_LOAD)
		plumed_SYSPATH =

Admin message