Merge pull request #3856 from akohlmey/remove-mscg-package

Remove MSCG package from LAMMPS distribution

cmake/CMakeLists.txt

@@ -279,7 +279,6 @@ set(STANDARD_PACKAGES
   MOLECULE
   MOLFILE
   MPIIO
-  MSCG
   NETCDF
   ORIENT
   PERI
@@ -441,7 +440,7 @@ if(BUILD_OMP)
   target_link_libraries(lmp PRIVATE OpenMP::OpenMP_CXX)
 endif()
 
-if(PKG_MSCG OR PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_ML-POD OR PKG_ELECTRODE OR BUILD_TOOLS)
+if(PKG_ATC OR PKG_AWPMD OR PKG_ML-QUIP OR PKG_ML-POD OR PKG_ELECTRODE OR BUILD_TOOLS)
   enable_language(C)
   if (NOT USE_INTERNAL_LINALG)
     find_package(LAPACK)
@@ -521,7 +520,7 @@ else()
 endif()
 
 foreach(PKG_WITH_INCL KSPACE PYTHON ML-IAP VORONOI COLVARS ML-HDNNP MDI MOLFILE NETCDF
-        PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM MSCG COMPRESS ML-PACE LEPTON)
+        PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM COMPRESS ML-PACE LEPTON)
   if(PKG_${PKG_WITH_INCL})
     include(Packages/${PKG_WITH_INCL})
   endif()

cmake/Modules/Packages/MSCG.cmake

@@ -1,28 +0,0 @@
-find_package(GSL REQUIRED)
-find_package(MSCG QUIET)
-if(MSGC_FOUND)
-  set(DOWNLOAD_MSCG_DEFAULT OFF)
-else()
-  set(DOWNLOAD_MSCG_DEFAULT ON)
-endif()
-option(DOWNLOAD_MSCG "Download MSCG library instead of using an already installed one)" ${DOWNLOAD_MSCG_DEFAULT})
-if(DOWNLOAD_MSCG)
-  set(MSCG_URL "https://github.com/uchicago-voth/MSCG-release/archive/491270a73539e3f6951e76f7dbe84e258b3ebb45.tar.gz" CACHE STRING "URL for MSCG tarball")
-  set(MSCG_MD5 "7ea50748fba5c3a372e0266bd31d2f11" CACHE STRING "MD5 checksum of MSCG tarball")
-  mark_as_advanced(MSCG_URL)
-  mark_as_advanced(MSCG_MD5)
-
-  include(ExternalCMakeProject)
-  ExternalCMakeProject(mscg ${MSCG_URL} ${MSCG_MD5} MSCG-release src/CMake "")
-
-  # set include and link library
-  target_include_directories(lammps PRIVATE "${CMAKE_BINARY_DIR}/_deps/mscg-src/src")
-  target_link_libraries(lammps PRIVATE mscg)
-else()
-  find_package(MSCG)
-  if(NOT MSCG_FOUND)
-    message(FATAL_ERROR "MSCG not found, help CMake to find it by setting MSCG_LIBRARY and MSCG_INCLUDE_DIR, or set DOWNLOAD_MSCG=ON to download it")
-  endif()
-  target_link_libraries(lammps PRIVATE MSCG::MSCG)
-endif()
-target_link_libraries(lammps PRIVATE GSL::gsl ${LAPACK_LIBRARIES})

cmake/presets/all_off.cmake

@@ -64,7 +64,6 @@ set(ALL_PACKAGES
   MOLECULE
   MOLFILE
   MPIIO
-  MSCG
   NETCDF
   OPENMP
   OPT

cmake/presets/all_on.cmake

@@ -66,7 +66,6 @@ set(ALL_PACKAGES
   MOLECULE
   MOLFILE
   MPIIO
-  MSCG
   NETCDF
   OPENMP
   OPT

cmake/presets/download.cmake

@@ -9,7 +9,6 @@ endforeach()
 
 set(DOWNLOAD_KIM ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_MDI ON CACHE BOOL "" FORCE)
-set(DOWNLOAD_MSCG ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_PACE ON CACHE BOOL "" FORCE)

cmake/presets/nolib.cmake

@@ -20,7 +20,6 @@ set(PACKAGES_WITH_LIB
   ML-QUIP
   MOLFILE
   MPIIO
-  MSCG
   NETCDF
   PLUMED
   PYTHON