ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Richard Berger
2017-07-14 22:08:06 -05:00
parent 5e841bfe15 d079b2f758
commit b15f75d37b
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/CMakeLists.txt
View File

@ -26,6 +26,7 @@ include(CheckCCompilerFlag)
# User input options # # User input options #
######################################################################## ########################################################################
option(BUILD_SHARED_LIBS "Build shared libs" OFF) option(BUILD_SHARED_LIBS "Build shared libs" OFF)
option(INSTALL_LIB "Install lammps library and header" ON)
include(GNUInstallDirs) include(GNUInstallDirs)
set(LAMMPS_LINK_LIBS) set(LAMMPS_LINK_LIBS)
@ -40,9 +41,10 @@ find_package(UnixCommands)
option(CMAKE_VERBOSE_MAKEFILE "Verbose makefile" OFF) 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 COLLOID CLASS2 COMPRESS CORESHELL DIPOLE GRANULAR KSPACE MC MOLECULE MANYBODY RIGID REAX)
foreach(PKG ${PACKAGES}) foreach(PKG ${PACKAGES})
option(ENABLE_${PKG} "Build ${PKG} Package" OFF) option(ENABLE_${PKG} "Build ${PKG} Package" ${ENABLE_ALL})
endforeach() endforeach()
set(ACCEL_PACKAGES USER_OMP) set(ACCEL_PACKAGES USER_OMP)
@ -188,8 +190,19 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR})
add_library(lammps ${LIB_SOURCES}) add_library(lammps ${LIB_SOURCES})
target_link_libraries(lammps ${LAMMPS_LINK_LIBS}) target_link_libraries(lammps ${LAMMPS_LINK_LIBS})
set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION}) set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION})
install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(INSTALL_LIB)
install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${LAMMPS_SOURCE_DIR}/lammps.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
elseif(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "Shared library has to install, use -DBUILD_SHARED_LIBS=OFF to install lammps with a a library")
endif()
add_executable(lmp ${LMP_SOURCES}) add_executable(lmp ${LMP_SOURCES})
target_link_libraries(lmp lammps) target_link_libraries(lmp lammps)
install(TARGETS lammps DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR})
foreach(PKG ${PACKAGES} ${ACCEL_PACKAGES})
if(ENABLE_${PKG})
message(STATUS "Building package: ${PKG}")
endif()
endforeach()

5
cmake/Modules/StyleHeaderUtils.cmake
View File

@ -51,8 +51,9 @@ function(CreateStyleHeader path filename)
set(temp "${temp}#include \"${FNAME}\"\n") set(temp "${temp}#include \"${FNAME}\"\n")
endforeach() endforeach()
endif() endif()
message("Generating ${filename}...") message(STATUS "Generating ${filename}...")
file(WRITE "${path}/${filename}" "${temp}" ) file(WRITE "${path}/${filename}.tmp" "${temp}" )
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${path}/${filename}.tmp" "${path}/${filename}")
endfunction(CreateStyleHeader) endfunction(CreateStyleHeader)
function(GenerateStyleHeader path property style) function(GenerateStyleHeader path property style)