cmake: make more include files consistent

cmake/CMakeLists.txt

@@ -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

cmake/Modules/Packages/CORESHELL.cmake

@@ -1,4 +1,3 @@
-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()

cmake/Modules/Packages/GPU.cmake

@@ -1,4 +1,3 @@
-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()

cmake/Modules/Packages/KOKKOS.cmake

@@ -1,4 +1,3 @@
-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()

cmake/Modules/Packages/OPT.cmake

@@ -1,4 +1,3 @@
-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()

cmake/Modules/Packages/QEQ.cmake

@@ -1,5 +1,4 @@
 # Fix qeq/fire requires MANYBODY (i.e. COMB and COMB3) to be installed
-if(PKG_QEQ)
 set(QEQ_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/QEQ)
 file(GLOB QEQ_HEADERS ${QEQ_SOURCES_DIR}/fix*.h)
 file(GLOB QEQ_SOURCES ${QEQ_SOURCES_DIR}/fix*.cpp)
@@ -17,4 +16,3 @@ if(PKG_QEQ)
 get_property(QEQ_SOURCES GLOBAL PROPERTY QEQ_SOURCES)
 target_sources(lammps PRIVATE ${QEQ_SOURCES})
 target_include_directories(lammps PRIVATE ${QEQ_SOURCES_DIR})
-endif()

cmake/Modules/Packages/USER-INTEL.cmake

@@ -1,4 +1,3 @@
-if(PKG_USER-INTEL)
 check_include_file_cxx(immintrin.h FOUND_IMMINTRIN)
 if(NOT FOUND_IMMINTRIN)
   message(FATAL_ERROR "immintrin.h header not found, Intel package won't work without it")
@@ -108,4 +107,3 @@ if(PKG_USER-INTEL)
 
 target_sources(lammps PRIVATE ${USER-INTEL_SOURCES})
 target_include_directories(lammps PRIVATE ${USER-INTEL_SOURCES_DIR})
-endif()

cmake/Modules/Packages/USER-OMP.cmake

@@ -1,4 +1,3 @@
-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
                        ${USER-OMP_SOURCES_DIR}/thr_omp.cpp
@@ -39,4 +38,3 @@ if(PKG_USER-OMP)
 
   target_sources(lammps PRIVATE ${USER-OMP_SOURCES})
   target_include_directories(lammps PRIVATE ${USER-OMP_SOURCES_DIR})
-endif()

cmake/Modules/Packages/USER-SDPD.cmake

@@ -1,5 +1,4 @@
 # Fix rigid/meso requires RIGID to be installed
-if(PKG_USER-SDPD)
 set(USER-SDPD_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-SDPD)
 
 get_property(hlist GLOBAL PROPERTY FIX)
@@ -12,4 +11,3 @@ if(PKG_USER-SDPD)
 set_property(GLOBAL PROPERTY FIX "${hlist}")
 
 target_include_directories(lammps PRIVATE ${USER-SDPD_SOURCES_DIR})
-endif()