From 3c34bdfdeddcee09134cb2be69c6377e02b7a798 Mon Sep 17 00:00:00 2001 From: Aidan Thompson Date: Thu, 3 Dec 2020 19:04:53 -0700 Subject: [PATCH] Updated the build files --- cmake/CMakeLists.txt | 7 +++---- cmake/Modules/Packages/{MLIAPPY.cmake => MLIAP.cmake} | 2 +- src/Makefile | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename cmake/Modules/Packages/{MLIAPPY.cmake => MLIAP.cmake} (78%) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index fab10bfdef..a034cf6d17 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -105,7 +105,7 @@ install(TARGETS lmp EXPORT LAMMPS_Targets DESTINATION ${CMAKE_INSTALL_BINDIR}) option(CMAKE_VERBOSE_MAKEFILE "Generate verbose Makefiles" OFF) set(STANDARD_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS DIPOLE - GRANULAR KSPACE LATTE MANYBODY MC MESSAGE MISC MLIAP MLIAPPY MOLECULE PERI POEMS + GRANULAR KSPACE LATTE MANYBODY MC MESSAGE MISC MLIAP MOLECULE PERI POEMS QEQ REPLICA RIGID SHOCK SPIN SNAP SRD KIM PYTHON MSCG MPIIO VORONOI USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESODPD USER-CGSDK USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP USER-H5MD USER-LB @@ -194,8 +194,7 @@ endif() # "hard" dependencies between packages resulting # in an error instead of skipping over files pkg_depends(MLIAP SNAP) -pkg_depends(MLIAPPY MLIAP) -pkg_depends(MLIAPPY PYTHON) +pkg_depends(MLIAP PYTHON) pkg_depends(MPIIO MPI) pkg_depends(USER-ATC MANYBODY) pkg_depends(USER-LB MPI) @@ -374,7 +373,7 @@ else() set(CUDA_REQUEST_PIC) endif() -foreach(PKG_WITH_INCL KSPACE PYTHON MLIAPPY VORONOI USER-COLVARS USER-MOLFILE USER-NETCDF USER-PLUMED USER-QMMM +foreach(PKG_WITH_INCL KSPACE PYTHON MLIAP VORONOI USER-COLVARS USER-MOLFILE USER-NETCDF USER-PLUMED USER-QMMM USER-QUIP USER-SCAFACOS USER-SMD USER-VTK KIM LATTE MESSAGE MSCG COMPRESS) if(PKG_${PKG_WITH_INCL}) include(Packages/${PKG_WITH_INCL}) diff --git a/cmake/Modules/Packages/MLIAPPY.cmake b/cmake/Modules/Packages/MLIAP.cmake similarity index 78% rename from cmake/Modules/Packages/MLIAPPY.cmake rename to cmake/Modules/Packages/MLIAP.cmake index 73ce83361c..e877d072b6 100644 --- a/cmake/Modules/Packages/MLIAPPY.cmake +++ b/cmake/Modules/Packages/MLIAP.cmake @@ -1,3 +1,3 @@ -execute_process(COMMAND cythonize mliap_model_python_couple.pyx WORKING_DIRECTORY ../src/MLIAPPY) +execute_process(COMMAND cythonize mliap_model_python_couple.pyx WORKING_DIRECTORY ../src/MLIAP) target_compile_definitions(lammps PRIVATE -DLMP_MLIAPPY) diff --git a/src/Makefile b/src/Makefile index 8667f3f725..149dedd35b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -48,7 +48,7 @@ endif PACKAGE = asphere body class2 colloid compress coreshell dipole gpu \ granular kim kokkos kspace latte manybody mc message misc \ - mliap mliappy molecule mpiio mscg opt peri poems \ + mliap molecule mpiio mscg opt peri poems \ python qeq replica rigid shock snap spin srd voronoi PACKUSER = user-adios user-atc user-awpmd user-bocs user-cgdna user-cgsdk user-colvars \