Merge branch 'cmake' of github.com:junghans/lammps into cmake

This commit is contained in:
Richard Berger 2017-07-15 17:47:53 -05:00
commit fdb5ccefc7
1 changed files with 11 additions and 2 deletions

View File

@ -43,7 +43,7 @@ find_package(UnixCommands)
option(CMAKE_VERBOSE_MAKEFILE "Verbose makefile" OFF)
option(ENABLE_ALL "Build all packages" OFF)
set(PACKAGES ASPHERE BODY COLLOID CLASS2 COMPRESS CORESHELL DIPOLE GRANULAR KSPACE MC MOLECULE MANYBODY RIGID REAX)
set(PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GRANULAR KSPACE MANYBODY MC MEAM MOLECULE RIGID REAX)
foreach(PKG ${PACKAGES})
option(ENABLE_${PKG} "Build ${PKG} Package" ${ENABLE_ALL})
endforeach()
@ -218,13 +218,22 @@ if(ENABLE_KOKKOS)
endif()
if(ENABLE_REAX)
if(ENABLE_REAX OR ENABLE_MEAM)
enable_language(Fortran)
endif()
if(ENABLE_REAX)
file(GLOB REAX_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/reax/*.F)
list(APPEND LIB_SOURCES ${REAX_SOURCES})
include_directories(${LAMMPS_LIB_SOURCE_DIR}/reax)
endif()
if(ENABLE_MEAM)
file(GLOB MEAM_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/meam/*.F ${LAMMPS_LIB_SOURCE_DIR}/meam/*.c)
list(APPEND LIB_SOURCES ${MEAM_SOURCES})
include_directories(${LAMMPS_LIB_SOURCE_DIR}/meam)
endif()
######################################################
# Generate style headers based on global list of