cmake: make more include files consistent (e18439f3) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+5 −8

Changes for cmake/CMakeLists.txt: 5 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -498,14 +498,11 @@ endif()
		# packages which selectively include variants based on enabled styles
		# e.g. accelerator packages
		######################################################################
		include(Packages/CORESHELL)
		include(Packages/QEQ)
		include(Packages/USER-OMP)
		include(Packages/USER-SDPD)
		include(Packages/KOKKOS)
		include(Packages/OPT)
		include(Packages/USER-INTEL)
		include(Packages/GPU)
		foreach(PKG_WITH_INCL CORESHELL QEQ USER-OMP USER-SDPD KOKKOS OPT USER-INTEL GPU)
		if(PKG_${PKG_WITH_INCL})
		include(Packages/${_PKG_INCL})
		endif()
		endforeach()

		######################################################################
		# the windows version of LAMMPS requires a couple extra libraries

+0 −2

Changes for cmake/Modules/Packages/CORESHELL.cmake: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		if(PKG_CORESHELL)
		set(CORESHELL_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/CORESHELL)
		set(CORESHELL_SOURCES)
		set_property(GLOBAL PROPERTY "CORESHELL_SOURCES" "${CORESHELL_SOURCES}")
		@@ -10,4 +9,3 @@ if(PKG_CORESHELL)

		target_sources(lammps PRIVATE ${CORESHELL_SOURCES})
		target_include_directories(lammps PRIVATE ${CORESHELL_SOURCES_DIR})
		endif()

+0 −2

Changes for cmake/Modules/Packages/GPU.cmake: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		if(PKG_GPU)
		set(GPU_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/GPU)
		set(GPU_SOURCES ${GPU_SOURCES_DIR}/gpu_extra.h
		${GPU_SOURCES_DIR}/fix_gpu.h
		@@ -194,4 +193,3 @@ if(PKG_GPU)
		set_target_properties(gpu PROPERTIES OUTPUT_NAME lammps_gpu${LAMMPS_LIB_SUFFIX})
		target_sources(lammps PRIVATE ${GPU_SOURCES})
		target_include_directories(lammps PRIVATE ${GPU_SOURCES_DIR})
		endif()

+0 −2

Changes for cmake/Modules/Packages/KOKKOS.cmake: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		if(PKG_KOKKOS)
		option(EXTERNAL_KOKKOS "Build against external kokkos library" OFF)
		option(DOWNLOAD_KOKKOS "Download the KOKKOS library instead of using the bundled one" OFF)
		if(DOWNLOAD_KOKKOS)
		@@ -97,4 +96,3 @@ if(PKG_KOKKOS)

		target_sources(lammps PRIVATE ${KOKKOS_PKG_SOURCES})
		target_include_directories(lammps PRIVATE ${KOKKOS_PKG_SOURCES_DIR})
		endif()

+0 −2

Changes for cmake/Modules/Packages/OPT.cmake: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		if(PKG_OPT)
		set(OPT_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/OPT)
		set(OPT_SOURCES)
		set_property(GLOBAL PROPERTY "OPT_SOURCES" "${OPT_SOURCES}")
		@@ -10,4 +9,3 @@ if(PKG_OPT)

		target_sources(lammps PRIVATE ${OPT_SOURCES})
		target_include_directories(lammps PRIVATE ${OPT_SOURCES_DIR})
		endif()