Unverified Commit 07d31f46 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

remove LAMMPS_LIB_SUFFIX variable and use LAMMPS_MACHINE instead. 

we are now always building the executable and the library and thus they should have a consistent suffix or none.
parent 79fc73d3

cmake/CMakeLists.txt

+6 −11
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ option(BUILD_SHARED_LIBS "Build shared library" OFF) 
if(BUILD_SHARED_LIBS) # for all pkg libs, mpi_stubs and linalg

  set(CMAKE_POSITION_INDEPENDENT_CODE ON)

endif()

set(LAMMPS_LIB_SUFFIX "" CACHE STRING "Suffix to append to liblammps and pkg-config file")

mark_as_advanced(LAMMPS_LIB_SUFFIX)

if(LAMMPS_LIB_SUFFIX)

  set(LAMMPS_LIB_SUFFIX "_${LAMMPS_LIB_SUFFIX}")

endif()



option(BUILD_TOOLS "Build and install LAMMPS tools (msi2lmp, binary2txt, chain)" OFF)
@@ -170,7 +165,7 @@ else() 
  if(NOT BUILD_SHARED_LIBS)

    install(TARGETS mpi_stubs EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

  endif()

  set_target_properties(mpi_stubs PROPERTIES OUTPUT_NAME lammps_mpi_stubs${LAMMPS_LIB_SUFFIX})

  set_target_properties(mpi_stubs PROPERTIES OUTPUT_NAME lammps_mpi_stubs${LAMMPS_MACHINE})

  target_include_directories(mpi_stubs PUBLIC $<BUILD_INTERFACE:${LAMMPS_SOURCE_DIR}/STUBS> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/lammps/mpi>)

  install(FILES ${LAMMPS_SOURCE_DIR}/STUBS/mpi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lammps/mpi)

  if(BUILD_SHARED_LIBS)
@@ -257,7 +252,7 @@ if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE) 
    if(NOT BUILD_SHARED_LIBS)

      install(TARGETS linalg EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

    endif()

    set_target_properties(linalg PROPERTIES OUTPUT_NAME lammps_linalg${LAMMPS_LIB_SUFFIX})

    set_target_properties(linalg PROPERTIES OUTPUT_NAME lammps_linalg${LAMMPS_MACHINE})

    set(BLAS_LIBRARIES "$<TARGET_FILE:linalg>")

    set(LAPACK_LIBRARIES "$<TARGET_FILE:linalg>")

  else()
@@ -418,7 +413,7 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD) 
    if(NOT BUILD_SHARED_LIBS)

      install(TARGETS ${PKG_LIB} EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

    endif()

    set_target_properties(${PKG_LIB} PROPERTIES OUTPUT_NAME lammps_${PKG_LIB}${LAMMPS_LIB_SUFFIX})

    set_target_properties(${PKG_LIB} PROPERTIES OUTPUT_NAME lammps_${PKG_LIB}${LAMMPS_MACHINE})

    target_link_libraries(lammps PRIVATE ${PKG_LIB})

    if(PKG_LIB STREQUAL awpmd)

      target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
@@ -522,7 +517,7 @@ if(LAMMPS_EXCEPTIONS) 
  list(APPEND LAMMPS_CXX_HEADERS exceptions.h)

endif()



set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_LIB_SUFFIX})

set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_MACHINE})

set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION})

install(TARGETS lammps EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

target_include_directories(lammps PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@@ -540,8 +535,8 @@ set(LAMMPS_API_DEFINES) 
foreach(_DEF ${LAMMPS_DEFINES})

  set(LAMMPS_API_DEFINES "${LAMMPS_API_DEFINES} -D${_DEF}")

endforeach()

configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_LIB_SUFFIX}.pc @ONLY)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_MACHINE}.pc @ONLY)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_MACHINE}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

install(EXPORT LAMMPS_Targets FILE LAMMPS_Targets.cmake NAMESPACE LAMMPS:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LAMMPS)

include(CMakePackageConfigHelpers)

configure_file(LAMMPSConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LAMMPSConfig.cmake @ONLY)

cmake/Modules/Packages/GPU.cmake

+1 −1
Original line number Diff line number Diff line
@@ -204,6 +204,6 @@ 
    install(TARGETS gpu EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

  endif()

  target_compile_definitions(gpu PRIVATE -DLAMMPS_${LAMMPS_SIZES})

  set_target_properties(gpu PROPERTIES OUTPUT_NAME lammps_gpu${LAMMPS_LIB_SUFFIX})

  set_target_properties(gpu PROPERTIES OUTPUT_NAME lammps_gpu${LAMMPS_MACHINE})

  target_sources(lammps PRIVATE ${GPU_SOURCES})

  target_include_directories(lammps PRIVATE ${GPU_SOURCES_DIR})

cmake/Modules/Packages/MESSAGE.cmake

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ if(NOT BUILD_SHARED_LIBS) 
  install(TARGETS cslib EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

endif()

target_compile_definitions(cslib PRIVATE -DLAMMPS_${LAMMPS_SIZES})

set_target_properties(cslib PROPERTIES OUTPUT_NAME lammps_cslib${LAMMPS_LIB_SUFFIX})

set_target_properties(cslib PROPERTIES OUTPUT_NAME lammps_cslib${LAMMPS_MACHINE})

if(BUILD_MPI)

  target_compile_definitions(cslib PRIVATE -DMPI_YES)

  set_target_properties(cslib PROPERTIES OUTPUT_NAME "csmpi")

cmake/Modules/Packages/USER-COLVARS.cmake

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ if(COLVARS_LEPTON) 
  if(NOT BUILD_SHARED_LIBS)

    install(TARGETS lepton EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

  endif()

  set_target_properties(lepton PROPERTIES OUTPUT_NAME lammps_lepton${LAMMPS_LIB_SUFFIX})

  set_target_properties(lepton PROPERTIES OUTPUT_NAME lammps_lepton${LAMMPS_MACHINE})

  target_include_directories(lepton PRIVATE ${LEPTON_DIR}/include)

endif()
@@ -21,7 +21,7 @@ if(NOT BUILD_SHARED_LIBS) 
  install(TARGETS colvars EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

endif()

target_compile_definitions(colvars PRIVATE -DLAMMPS_${LAMMPS_SIZES})

set_target_properties(colvars PROPERTIES OUTPUT_NAME lammps_colvars${LAMMPS_LIB_SUFFIX})

set_target_properties(colvars PROPERTIES OUTPUT_NAME lammps_colvars${LAMMPS_MACHINE})

target_include_directories(colvars PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/colvars)

target_link_libraries(lammps PRIVATE colvars)

cmake/Modules/Packages/USER-QMMM.cmake

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ add_library(qmmm STATIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm/libqmmm.c) 
if(NOT BUILD_SHARED_LIBS)

  install(TARGETS qmmm EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

endif()

set_target_properties(qmmm PROPERTIES OUTPUT_NAME lammps_qmmm${LAMMPS_LIB_SUFFIX})

set_target_properties(qmmm PROPERTIES OUTPUT_NAME lammps_qmmm${LAMMPS_MACHINE})

target_link_libraries(lammps PRIVATE qmmm)

target_include_directories(qmmm PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE