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

cmake: remove LAMMPS_LINK_LIBS

Browse Source
This commit is contained in:
Christoph Junghans
2020-03-22 18:55:53 -06:00
parent cd89a7c4b7
commit 5828815b3e
20 changed files with 60 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/CMakeLists.txt
View File

@ -126,7 +126,6 @@ endif()
option(CMAKE_VERBOSE_MAKEFILE "Generate verbose Makefiles" OFF) option(CMAKE_VERBOSE_MAKEFILE "Generate verbose Makefiles" OFF)
include(GNUInstallDirs) include(GNUInstallDirs)
set(LAMMPS_LINK_LIBS)
set(LAMMPS_DEPS) set(LAMMPS_DEPS)
set(LAMMPS_API_DEFINES) set(LAMMPS_API_DEFINES)
@ -173,7 +172,7 @@ if(PKG_USER-ADIOS)
# script that defines the MPI::MPI_C target # script that defines the MPI::MPI_C target
enable_language(C) enable_language(C)
find_package(ADIOS2 REQUIRED) find_package(ADIOS2 REQUIRED)
list(APPEND LAMMPS_LINK_LIBS adios2::adios2) target_link_libraries(lammps PRIVATE adios2::adios2)
endif() endif()
# do MPI detection after language activation, # do MPI detection after language activation,
@ -188,9 +187,8 @@ if(BUILD_MPI)
include(MPI4WIN) include(MPI4WIN)
else() else()
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
include_directories(${MPI_CXX_INCLUDE_PATH})
add_definitions(-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1) add_definitions(-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1)
list(APPEND LAMMPS_LINK_LIBS ${MPI_CXX_LIBRARIES}) target_link_libraries(lammps PRIVATE MPI::MPI_CXX)
option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF) option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
if(LAMMPS_LONGLONG_TO_LONG) if(LAMMPS_LONGLONG_TO_LONG)
add_definitions(-DLAMMPS_LONGLONG_TO_LONG) add_definitions(-DLAMMPS_LONGLONG_TO_LONG)
@ -201,7 +199,7 @@ else()
file(GLOB MPI_SOURCES ${LAMMPS_SOURCE_DIR}/STUBS/mpi.c) file(GLOB MPI_SOURCES ${LAMMPS_SOURCE_DIR}/STUBS/mpi.c)
add_library(mpi_stubs STATIC ${MPI_SOURCES}) add_library(mpi_stubs STATIC ${MPI_SOURCES})
include_directories(${LAMMPS_SOURCE_DIR}/STUBS) include_directories(${LAMMPS_SOURCE_DIR}/STUBS)
list(APPEND LAMMPS_LINK_LIBS mpi_stubs) target_link_libraries(lammps PRIVATE mpi_stubs)
endif() endif()
set(LAMMPS_SIZES "smallbig" CACHE STRING "LAMMPS integer sizes (smallsmall: all 32-bit, smallbig: 64-bit #atoms #timesteps, bigbig: also 64-bit imageint, 64-bit atom ids)") set(LAMMPS_SIZES "smallbig" CACHE STRING "LAMMPS integer sizes (smallsmall: all 32-bit, smallbig: 64-bit #atoms #timesteps, bigbig: also 64-bit imageint, 64-bit atom ids)")
@ -284,8 +282,7 @@ option(WITH_JPEG "Enable JPEG support" ${JPEG_FOUND})
if(WITH_JPEG) if(WITH_JPEG)
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
add_definitions(-DLAMMPS_JPEG) add_definitions(-DLAMMPS_JPEG)
include_directories(${JPEG_INCLUDE_DIR}) target_link_libraries(lammps PRIVATE JPEG::JPEG)
list(APPEND LAMMPS_LINK_LIBS ${JPEG_LIBRARIES})
endif() endif()
find_package(PNG QUIET) find_package(PNG QUIET)
@ -298,8 +295,7 @@ endif()
if(WITH_PNG) if(WITH_PNG)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
include_directories(${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) target_link_libraries(lammps PRIVATE PNG::PNG ZLIB::ZLIB)
list(APPEND LAMMPS_LINK_LIBS ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
add_definitions(-DLAMMPS_PNG) add_definitions(-DLAMMPS_PNG)
endif() endif()
@ -376,7 +372,7 @@ include(CheckLibraryExists)
# message(FATAL_ERROR "Could not find needed math function - ${FUNC}") # message(FATAL_ERROR "Could not find needed math function - ${FUNC}")
# endif(NOT FOUND_${FUNC}_${MATH_LIBRARIES}) # endif(NOT FOUND_${FUNC}_${MATH_LIBRARIES})
#endforeach(FUNC) #endforeach(FUNC)
list(APPEND LAMMPS_LINK_LIBS ${MATH_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MATH_LIBRARIES})
###################################### ######################################
# Generate Basic Style files # Generate Basic Style files
@ -442,7 +438,7 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD)
if(LAMMPS_USE_MPI4WIN) if(LAMMPS_USE_MPI4WIN)
add_dependencies(${PKG_LIB} mpi4win_build) add_dependencies(${PKG_LIB} mpi4win_build)
endif() endif()
list(APPEND LAMMPS_LINK_LIBS ${PKG_LIB}) target_link_libraries(lammps PRIVATE ${PKG_LIB})
if(PKG_LIB STREQUAL awpmd) if(PKG_LIB STREQUAL awpmd)
target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include) target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
elseif(PKG_LIB STREQUAL h5md) elseif(PKG_LIB STREQUAL h5md)
@ -486,9 +482,9 @@ include(Packages/GPU)
###################################################################### ######################################################################
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if(LAMMPS_USE_MPI4WIN) if(LAMMPS_USE_MPI4WIN)
list(APPEND LAMMPS_LINK_LIBS ${MPI4WIN_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MPI4WIN_LIBRARIES})
endif() endif()
list(APPEND LAMMPS_LINK_LIBS -lwsock32 -lpsapi) target_link_libraries(lammps PRIVATE -lwsock32 -lpsapi)
endif() endif()
###################################################### ######################################################
@ -538,11 +534,9 @@ list(APPEND LAMMPS_DEPS gitversion)
get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES) get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
list (FIND LANGUAGES "Fortran" _index) list (FIND LANGUAGES "Fortran" _index)
if (${_index} GREATER -1) if (${_index} GREATER -1)
list(APPEND LAMMPS_LINK_LIBS ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}) target_link_libraries(lammps PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
endif() endif()
list(REMOVE_DUPLICATES LAMMPS_LINK_LIBS)
if(BUILD_LIB) if(BUILD_LIB)
target_link_libraries(lammps ${LAMMPS_LINK_LIBS})
if(LAMMPS_DEPS) if(LAMMPS_DEPS)
add_dependencies(lammps ${LAMMPS_DEPS}) add_dependencies(lammps ${LAMMPS_DEPS})
endif() endif()
@ -591,7 +585,6 @@ endif()
if(BUILD_EXE) if(BUILD_EXE)
if(NOT BUILD_LIB) if(NOT BUILD_LIB)
target_link_libraries(${LAMMPS_EXE} ${LAMMPS_LINK_LIBS})
if(LAMMPS_DEPS) if(LAMMPS_DEPS)
add_dependencies(${LAMMPS_EXE} ${LAMMPS_DEPS}) add_dependencies(${LAMMPS_EXE} ${LAMMPS_DEPS})
endif() endif()
@ -736,7 +729,6 @@ if(BUILD_SHARED_LIBS)
else() else()
message(STATUS "Static library flags: ${CMAKE_STATIC_LINKER_FLAGS}") message(STATUS "Static library flags: ${CMAKE_STATIC_LINKER_FLAGS}")
endif() endif()
message(STATUS "Link libraries: ${LAMMPS_LINK_LIBS}")
if(BUILD_MPI) if(BUILD_MPI)
message(STATUS "Using MPI with headers in ${MPI_CXX_INCLUDE_PATH} and these libraries: ${MPI_CXX_LIBRARIES};${MPI_Fortran_LIBRARIES}") message(STATUS "Using MPI with headers in ${MPI_CXX_INCLUDE_PATH} and these libraries: ${MPI_CXX_LIBRARIES};${MPI_Fortran_LIBRARIES}")
endif() endif()

3
cmake/Modules/Packages/COMPRESS.cmake
View File

@ -1,5 +1,4 @@
if(PKG_COMPRESS) if(PKG_COMPRESS)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS}) target_link_libraries(lammps PRIVATE ZLIB::ZLIB)
list(APPEND LAMMPS_LINK_LIBS ${ZLIB_LIBRARIES})
endif() endif()

4
cmake/Modules/Packages/GPU.cmake
View File

@ -107,7 +107,7 @@ if(PKG_GPU)
target_compile_definitions(gpu PRIVATE -DUSE_CUDPP) target_compile_definitions(gpu PRIVATE -DUSE_CUDPP)
endif() endif()
list(APPEND LAMMPS_LINK_LIBS gpu) target_link_libraries(lammps PRIVATE gpu)
if(LAMMPS_USE_MPI4WIN) if(LAMMPS_USE_MPI4WIN)
add_dependencies(gpu mpi4win_build) add_dependencies(gpu mpi4win_build)
endif() endif()
@ -171,7 +171,7 @@ if(PKG_GPU)
target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -D${OCL_TUNE}_OCL -DMPI_GERYON -DUCL_NO_EXIT) target_compile_definitions(gpu PRIVATE -D_${GPU_PREC_SETTING} -D${OCL_TUNE}_OCL -DMPI_GERYON -DUCL_NO_EXIT)
target_compile_definitions(gpu PRIVATE -DUSE_OPENCL) target_compile_definitions(gpu PRIVATE -DUSE_OPENCL)
list(APPEND LAMMPS_LINK_LIBS gpu) target_link_libraries(lammps PRIVATE gpu)
if(LAMMPS_USE_MPI4WIN) if(LAMMPS_USE_MPI4WIN)
add_dependencies(gpu mpi4win_build) add_dependencies(gpu mpi4win_build)
endif() endif()

5
cmake/Modules/Packages/KIM.cmake
View File

@ -2,8 +2,7 @@ if(PKG_KIM)
set(KIM-API_MIN_VERSION 2.1) set(KIM-API_MIN_VERSION 2.1)
find_package(CURL) find_package(CURL)
if(CURL_FOUND) if(CURL_FOUND)
include_directories(${CURL_INCLUDE_DIRS}) target_link_libraries(lammps PRIVATE CURL::libcurl)
list(APPEND LAMMPS_LINK_LIBS ${CURL_LIBRARIES})
add_definitions(-DLMP_KIM_CURL) add_definitions(-DLMP_KIM_CURL)
set(LMP_DEBUG_CURL OFF CACHE STRING "Set libcurl verbose mode on/off. If on, it displays a lot of verbose information about its operations.") set(LMP_DEBUG_CURL OFF CACHE STRING "Set libcurl verbose mode on/off. If on, it displays a lot of verbose information about its operations.")
mark_as_advanced(LMP_DEBUG_CURL) mark_as_advanced(LMP_DEBUG_CURL)
@ -62,6 +61,6 @@ if(PKG_KIM)
else() else()
find_package(KIM-API ${KIM-API_MIN_VERSION} REQUIRED) find_package(KIM-API ${KIM-API_MIN_VERSION} REQUIRED)
endif() endif()
list(APPEND LAMMPS_LINK_LIBS "${KIM-API_LDFLAGS}") target_link_libraries(lammps PRIVATE "${KIM-API_LDFLAGS}")
include_directories(${KIM-API_INCLUDE_DIRS}) include_directories(${KIM-API_INCLUDE_DIRS})
endif() endif()

6
cmake/Modules/Packages/KOKKOS.cmake
View File

@ -5,7 +5,7 @@ if(PKG_KOKKOS)
option(EXTERNAL_KOKKOS "Build against external kokkos library") option(EXTERNAL_KOKKOS "Build against external kokkos library")
if(EXTERNAL_KOKKOS) if(EXTERNAL_KOKKOS)
find_package(Kokkos REQUIRED) find_package(Kokkos REQUIRED)
list(APPEND LAMMPS_LINK_LIBS Kokkos::kokkos) target_link_libraries(lammps PRIVATE Kokkos::kokkos)
else() else()
set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos) set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)
set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos) set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos)
@ -16,7 +16,7 @@ if(PKG_KOKKOS)
${LAMMPS_LIB_KOKKOS_SRC_DIR}/algorithms/src ${LAMMPS_LIB_KOKKOS_SRC_DIR}/algorithms/src
${LAMMPS_LIB_KOKKOS_BIN_DIR}) ${LAMMPS_LIB_KOKKOS_BIN_DIR})
include_directories(${Kokkos_INCLUDE_DIRS}) include_directories(${Kokkos_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS kokkos) target_link_libraries(lammps PRIVATE kokkos)
endif() endif()
add_definitions(-DLMP_KOKKOS) add_definitions(-DLMP_KOKKOS)
@ -45,7 +45,7 @@ if(PKG_KOKKOS)
if(KOKKOS_ENABLE_CUDA) if(KOKKOS_ENABLE_CUDA)
if(NOT ${FFT} STREQUAL "KISS") if(NOT ${FFT} STREQUAL "KISS")
add_definitions(-DFFT_CUFFT) add_definitions(-DFFT_CUFFT)
list(APPEND LAMMPS_LINK_LIBS cufft) target_link_libraries(lammps PRIVATE cufft)
endif() endif()
endif() endif()
endif() endif()

6
cmake/Modules/Packages/KSPACE.cmake
View File

@ -20,7 +20,7 @@ if(PKG_KSPACE)
find_package(${FFTW} REQUIRED) find_package(${FFTW} REQUIRED)
add_definitions(-DFFT_FFTW3) add_definitions(-DFFT_FFTW3)
include_directories(${${FFTW}_INCLUDE_DIRS}) include_directories(${${FFTW}_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${${FFTW}_LIBRARIES}) target_link_libraries(lammps PRIVATE ${${FFTW}_LIBRARIES})
if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY) if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)
option(FFT_FFTW_THREADS "Use threaded FFTW library" ON) option(FFT_FFTW_THREADS "Use threaded FFTW library" ON)
else() else()
@ -30,7 +30,7 @@ if(PKG_KSPACE)
if(FFT_FFTW_THREADS) if(FFT_FFTW_THREADS)
if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY) if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)
add_definitions(-DFFT_FFTW_THREADS) add_definitions(-DFFT_FFTW_THREADS)
list(APPEND LAMMPS_LINK_LIBS ${${FFTW}_OMP_LIBRARIES}) target_link_libraries(lammps PRIVATE ${${FFTW}_OMP_LIBRARIES})
else() else()
message(FATAL_ERROR "Need OpenMP enabled FFTW3 library for FFT_THREADS") message(FATAL_ERROR "Need OpenMP enabled FFTW3 library for FFT_THREADS")
endif() endif()
@ -43,7 +43,7 @@ if(PKG_KSPACE)
add_definitions(-DFFT_MKL_THREADS) add_definitions(-DFFT_MKL_THREADS)
endif() endif()
include_directories(${MKL_INCLUDE_DIRS}) include_directories(${MKL_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${MKL_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MKL_LIBRARIES})
else() else()
# last option is KISSFFT # last option is KISSFFT
add_definitions(-DFFT_KISS) add_definitions(-DFFT_KISS)

2
cmake/Modules/Packages/LATTE.cmake
View File

@ -36,5 +36,5 @@ if(PKG_LATTE)
if(NOT LAPACK_FOUND) if(NOT LAPACK_FOUND)
add_dependencies(latte_build linalg) add_dependencies(latte_build linalg)
endif() endif()
list(APPEND LAMMPS_LINK_LIBS ${LATTE_LIBRARIES} ${LAPACK_LIBRARIES}) target_link_libraries(lammps PRIVATE ${LATTE_LIBRARIES} ${LAPACK_LIBRARIES})
endif() endif()

2
cmake/Modules/Packages/MESSAGE.cmake
View File

@ -27,6 +27,6 @@ if(PKG_MESSAGE)
target_include_directories(cslib PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/src/STUBS_ZMQ) target_include_directories(cslib PRIVATE ${LAMMPS_LIB_SOURCE_DIR}/message/cslib/src/STUBS_ZMQ)
endif() endif()
list(APPEND LAMMPS_LINK_LIBS cslib) target_link_libraries(lammps PRIVATE cslib)
include_directories(${LAMMPS_LIB_SOURCE_DIR}/message/cslib/src) include_directories(${LAMMPS_LIB_SOURCE_DIR}/message/cslib/src)
endif() endif()

2
cmake/Modules/Packages/MSCG.cmake
View File

@ -43,6 +43,6 @@ if(PKG_MSCG)
message(FATAL_ERROR "MSCG not found, help CMake to find it by setting MSCG_LIBRARY and MSCG_INCLUDE_DIRS, or set DOWNLOAD_MSCG=ON to download it") message(FATAL_ERROR "MSCG not found, help CMake to find it by setting MSCG_LIBRARY and MSCG_INCLUDE_DIRS, or set DOWNLOAD_MSCG=ON to download it")
endif() endif()
endif() endif()
list(APPEND LAMMPS_LINK_LIBS ${MSCG_LIBRARIES} ${GSL_LIBRARIES} ${LAPACK_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MSCG_LIBRARIES} GSL::gsl ${LAPACK_LIBRARIES})
include_directories(${MSCG_INCLUDE_DIRS}) include_directories(${MSCG_INCLUDE_DIRS})
endif() endif()

2
cmake/Modules/Packages/PYTHON.cmake
View File

@ -2,5 +2,5 @@ if(PKG_PYTHON)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
add_definitions(-DLMP_PYTHON) add_definitions(-DLMP_PYTHON)
include_directories(${PYTHON_INCLUDE_DIR}) include_directories(${PYTHON_INCLUDE_DIR})
list(APPEND LAMMPS_LINK_LIBS ${PYTHON_LIBRARY}) target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARY})
endif() endif()

4
cmake/Modules/Packages/USER-COLVARS.cmake
View File

@ -16,10 +16,10 @@ if(PKG_USER-COLVARS)
add_library(colvars STATIC ${COLVARS_SOURCES}) add_library(colvars STATIC ${COLVARS_SOURCES})
target_include_directories(colvars PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/colvars) target_include_directories(colvars PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/colvars)
list(APPEND LAMMPS_LINK_LIBS colvars) target_link_libraries(lammps PRIVATE colvars)
if(COLVARS_LEPTON) if(COLVARS_LEPTON)
list(APPEND LAMMPS_LINK_LIBS lepton) target_link_libraries(lammps PRIVATE lepton)
target_compile_options(colvars PRIVATE -DLEPTON) target_compile_options(colvars PRIVATE -DLEPTON)
target_include_directories(colvars PUBLIC ${LEPTON_DIR}/include) target_include_directories(colvars PUBLIC ${LEPTON_DIR}/include)
endif() endif()

6
cmake/Modules/Packages/USER-INTEL.cmake
View File

@ -25,7 +25,7 @@ if(PKG_USER-INTEL)
if(INTEL_LRT_MODE STREQUAL "THREADS") if(INTEL_LRT_MODE STREQUAL "THREADS")
if(Threads_FOUND) if(Threads_FOUND)
add_definitions(-DLMP_INTEL_USELRT) add_definitions(-DLMP_INTEL_USELRT)
list(APPEND LAMMPS_LINK_LIBS ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(lammps PRIVATE Threads::Threads)
else() else()
message(FATAL_ERROR "Must have working threads library for Long-range thread support") message(FATAL_ERROR "Must have working threads library for Long-range thread support")
endif() endif()
@ -44,7 +44,7 @@ if(PKG_USER-INTEL)
find_package(TBB QUIET) find_package(TBB QUIET)
if(TBB_FOUND) if(TBB_FOUND)
list(APPEND LAMMPS_LINK_LIBS ${TBB_MALLOC_LIBRARIES}) target_link_libraries(lammps PRIVATE ${TBB_MALLOC_LIBRARIES})
else() else()
add_definitions(-DLMP_INTEL_NO_TBB) add_definitions(-DLMP_INTEL_NO_TBB)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
@ -55,7 +55,7 @@ if(PKG_USER-INTEL)
find_package(MKL QUIET) find_package(MKL QUIET)
if(MKL_FOUND) if(MKL_FOUND)
add_definitions(-DLMP_USE_MKL_RNG) add_definitions(-DLMP_USE_MKL_RNG)
list(APPEND LAMMPS_LINK_LIBS ${MKL_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MKL_LIBRARIES})
else() else()
message(STATUS "Pair style dpd/intel will be faster with MKL libraries") message(STATUS "Pair style dpd/intel will be faster with MKL libraries")
endif() endif()

2
cmake/Modules/Packages/USER-MOLFILE.cmake
View File

@ -6,5 +6,5 @@ if(PKG_USER-MOLFILE)
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_link_libraries(molfile INTERFACE ${CMAKE_DL_LIBS}) target_link_libraries(molfile INTERFACE ${CMAKE_DL_LIBS})
endif() endif()
list(APPEND LAMMPS_LINK_LIBS molfile) target_link_libraries(lammps PRIVATE molfile)
endif() endif()

4
cmake/Modules/Packages/USER-NETCDF.cmake
View File

@ -10,13 +10,13 @@ if(PKG_USER-NETCDF)
if(NETCDF_FOUND) if(NETCDF_FOUND)
include_directories(${NETCDF_INCLUDE_DIRS}) include_directories(${NETCDF_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${NETCDF_LIBRARIES}) target_link_libraries(lammps PRIVATE ${NETCDF_LIBRARIES})
add_definitions(-DLMP_HAS_NETCDF) add_definitions(-DLMP_HAS_NETCDF)
endif(NETCDF_FOUND) endif(NETCDF_FOUND)
if(PNETCDF_FOUND) if(PNETCDF_FOUND)
include_directories(${PNETCDF_INCLUDES}) include_directories(${PNETCDF_INCLUDES})
list(APPEND LAMMPS_LINK_LIBS ${PNETCDF_LIBRARIES}) target_link_libraries(lammps PRIVATE ${PNETCDF_LIBRARIES})
add_definitions(-DLMP_HAS_PNETCDF) add_definitions(-DLMP_HAS_PNETCDF)
endif(PNETCDF_FOUND) endif(PNETCDF_FOUND)

8
cmake/Modules/Packages/USER-PLUMED.cmake
View File

@ -70,12 +70,12 @@ if(PKG_USER-PLUMED)
list(APPEND LAMMPS_DEPS plumed_build) list(APPEND LAMMPS_DEPS plumed_build)
if(PLUMED_MODE STREQUAL "STATIC") if(PLUMED_MODE STREQUAL "STATIC")
add_definitions(-D__PLUMED_WRAPPER_CXX=1) add_definitions(-D__PLUMED_WRAPPER_CXX=1)
list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed.a ${PLUMED_LINK_LIBS} ${CMAKE_DL_LIBS}) target_link_libraries(lammps ${PLUMED_INSTALL_DIR}/lib/libplumed.a ${PLUMED_LINK_LIBS} ${CMAKE_DL_LIBS})
elseif(PLUMED_MODE STREQUAL "SHARED") elseif(PLUMED_MODE STREQUAL "SHARED")
list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX} ${PLUMED_INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_DL_LIBS}) target_link_libraries(lammps PRIVATE ${PLUMED_INSTALL_DIR}/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX} ${PLUMED_INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_DL_LIBS})
elseif(PLUMED_MODE STREQUAL "RUNTIME") elseif(PLUMED_MODE STREQUAL "RUNTIME")
add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}) add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_INSTALL_DIR}/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX})
list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumedWrapper.a -rdynamic ${CMAKE_DL_LIBS}) target_link_libraries(lammps PRIVATE ${PLUMED_INSTALL_DIR}/lib/libplumedWrapper.a -rdynamic ${CMAKE_DL_LIBS})
endif() endif()
set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include") set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include")
else() else()
@ -90,7 +90,7 @@ if(PKG_USER-PLUMED)
add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}) add_definitions(-D__PLUMED_HAS_DLOPEN=1 -D__PLUMED_DEFAULT_KERNEL=${PLUMED_LIBDIR}/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX})
include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.runtime) include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.runtime)
endif() endif()
list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LOAD}) target_link_libraries(lammps PRIVATE ${PLUMED_LOAD})
endif() endif()
include_directories(${PLUMED_INCLUDE_DIRS}) include_directories(${PLUMED_INCLUDE_DIRS})
endif() endif()

2
cmake/Modules/Packages/USER-QMMM.cmake
View File

@ -8,6 +8,6 @@ if(PKG_USER-QMMM)
message(WARNING "It is recommended to use BUILD_SHARED_LIBS=yes with USER-QMMM") message(WARNING "It is recommended to use BUILD_SHARED_LIBS=yes with USER-QMMM")
endif() endif()
add_library(qmmm STATIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm/libqmmm.c) add_library(qmmm STATIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm/libqmmm.c)
list(APPEND LAMMPS_LINK_LIBS qmmm) target_link_libraries(lammps PRIVATE qmmm)
target_include_directories(qmmm PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm) target_include_directories(qmmm PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm)
endif() endif()

2
cmake/Modules/Packages/USER-QUIP.cmake
View File

@ -1,5 +1,5 @@
if(PKG_USER-QUIP) if(PKG_USER-QUIP)
enable_language(Fortran) enable_language(Fortran)
find_package(QUIP REQUIRED) find_package(QUIP REQUIRED)
list(APPEND LAMMPS_LINK_LIBS ${QUIP_LIBRARIES} ${LAPACK_LIBRARIES}) target_link_libraries(lammps PRIVATE ${LAPACK_LIBRARIES})
endif() endif()

38
cmake/Modules/Packages/USER-SCAFACOS.cmake
View File

@ -49,28 +49,28 @@ if(PKG_USER-SCAFACOS)
set(SCAFACOS_INCLUDE_DIRS ${SCAFACOS_BUILD_DIR}/include) set(SCAFACOS_INCLUDE_DIRS ${SCAFACOS_BUILD_DIR}/include)
list(APPEND LAMMPS_DEPS scafacos_build) list(APPEND LAMMPS_DEPS scafacos_build)
# list and order from pkg_config file of ScaFaCoS build # list and order from pkg_config file of ScaFaCoS build
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_direct.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_direct.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_ewald.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_ewald.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_fmm.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_fmm.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_p2nfft.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_p2nfft.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_p3m.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_p3m.a)
list(APPEND LAMMPS_LINK_LIBS ${GSL_LIBRARIES}) target_link_libraries(lammps PRIVATE ${GSL_LIBRARIES})
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_near.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_near.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_gridsort.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_gridsort.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_resort.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_resort.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_redist.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_redist.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_common.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_common.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_pnfft.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_pnfft.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_pfft.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_pfft.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_fftw3_mpi.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_fftw3_mpi.a)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_BUILD_DIR}/lib/libfcs_fftw3.a) target_link_libraries(lammps PRIVATE ${SCAFACOS_BUILD_DIR}/lib/libfcs_fftw3.a)
list(APPEND LAMMPS_LINK_LIBS ${MPI_Fortran_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MPI_Fortran_LIBRARIES})
list(APPEND LAMMPS_LINK_LIBS ${MPI_C_LIBRARIES}) target_link_libraries(lammps PRIVATE ${MPI_C_LIBRARIES})
else() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(SCAFACOS REQUIRED scafacos) pkg_check_modules(SCAFACOS REQUIRED scafacos)
list(APPEND LAMMPS_LINK_LIBS ${SCAFACOS_LDFLAGS}) target_link_libraries(lammps PRIVATE ${SCAFACOS_LDFLAGS})
endif() endif()
include_directories(${SCAFACOS_INCLUDE_DIRS}) include_directories(${SCAFACOS_INCLUDE_DIRS})
endif() endif()

2
cmake/Modules/Packages/USER-VTK.cmake
View File

@ -2,5 +2,5 @@ if(PKG_USER-VTK)
find_package(VTK REQUIRED NO_MODULE) find_package(VTK REQUIRED NO_MODULE)
include(${VTK_USE_FILE}) include(${VTK_USE_FILE})
add_definitions(-DLAMMPS_VTK) add_definitions(-DLAMMPS_VTK)
list(APPEND LAMMPS_LINK_LIBS ${VTK_LIBRARIES}) target_link_libraries(lammps PRIVATE ${VTK_LIBRARIES})
endif() endif()

2
cmake/Modules/Packages/VORONOI.cmake
View File

@ -39,5 +39,5 @@ if(PKG_VORONOI)
endif() endif()
endif() endif()
include_directories(${VORO_INCLUDE_DIRS}) include_directories(${VORO_INCLUDE_DIRS})
list(APPEND LAMMPS_LINK_LIBS ${VORO_LIBRARIES}) target_link_libraries(lammps PRIVATE ${VORO_LIBRARIES})
endif() endif()