add explicit pattern based dependencies for CORESHELL packages, so KSPACE is no longer enforced (82c9e8a5) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+16 −2

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ if(ENABLE_TESTING)
		enable_testing()
		endif(ENABLE_TESTING)

		set(DEFAULT_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GRANULAR
		set(DEFAULT_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS DIPOLE GRANULAR
		KSPACE MANYBODY MC MEAM MISC MOLECULE PERI QEQ REAX REPLICA RIGID SHOCK SPIN SNAP
		SRD KIM PYTHON MSCG MPIIO VORONOI POEMS LATTE USER-ATC USER-AWPMD USER-BOCS
		USER-CGDNA USER-MESO USER-CGSDK USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE
		@@ -161,6 +161,7 @@ set(DEFAULT_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GRANU
		USER-MOFFF USER-MOLFILE USER-NETCDF USER-PHONON USER-QTB USER-REAXC USER-SMD
		USER-SMTBQ USER-SPH USER-TALLY USER-UEF USER-VTK USER-QUIP USER-QMMM)
		set(ACCEL_PACKAGES USER-OMP KOKKOS OPT USER-INTEL GPU)
		set(OTHER_PACKAGES CORESHELL)
		foreach(PKG ${DEFAULT_PACKAGES})
		option(PKG_${PKG} "Build ${PKG} Package" OFF)
		endforeach()
		@@ -180,7 +181,6 @@ pkg_depends(USER-ATC MANYBODY)
		pkg_depends(USER-LB MPI)
		pkg_depends(USER-MISC MANYBODY)
		pkg_depends(USER-PHONON KSPACE)
		pkg_depends(CORESHELL KSPACE)

		######################################################
		# packages with special compiler needs or external libs
		@@ -574,6 +574,20 @@ endif()
		# packages which selectively include variants based on enabled styles
		# e.g. accelerator packages
		######################################################################
		if(PKG_CORESHELL)
		set(CORESHELL_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/CORESHELL)
		set(CORESHELL_SOURCES)
		set_property(GLOBAL PROPERTY "CORESHELL_SOURCES" "${CORESHELL_SOURCES}")

		# detects styles which have a CORESHELL version
		RegisterStylesExt(${CORESHELL_SOURCES_DIR} cs CORESHELL_SOURCES)

		get_property(CORESHELL_SOURCES GLOBAL PROPERTY CORESHELL_SOURCES)

		list(APPEND LIB_SOURCES ${CORESHELL_SOURCES})
		include_directories(${CORESHELL_SOURCES_DIR})
		endif()

		if(PKG_USER-OMP)
		set(USER-OMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-OMP)
		set(USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/thr_data.cpp

Admin message