Unverified Commit 790b2693 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #2353 from junghans/cmake_clean_up 

cmake: consistent usage of find variable
parents a51bebc9 f72e5b6d

cmake/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ if(WITH_JPEG) 
  find_package(JPEG REQUIRED)

  target_compile_definitions(lammps PRIVATE -DLAMMPS_JPEG)

  if(CMAKE_VERSION VERSION_LESS 3.12)

    target_include_directories(lammps PRIVATE ${JPEG_INCLUDE_DIR})

    target_include_directories(lammps PRIVATE ${JPEG_INCLUDE_DIRS})

    target_link_libraries(lammps PRIVATE ${JPEG_LIBRARIES})

  else()

    target_link_libraries(lammps PRIVATE JPEG::JPEG)

cmake/Modules/Packages/KSPACE.cmake

+4 −4
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ if(FFT STREQUAL "FFTW3") 
  find_package(${FFTW} REQUIRED)

  target_compile_definitions(lammps PRIVATE -DFFT_FFTW3)

  target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW})

  if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)

  if(FFTW3_OMP_LIBRARIES OR FFTW3F_OMP_LIBRARIES)

    option(FFT_FFTW_THREADS "Use threaded FFTW library" ON)

  else()

    option(FFT_FFTW_THREADS "Use threaded FFT library" OFF)

  endif()



  if(FFT_FFTW_THREADS)

    if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)

    if(FFTW3_OMP_LIBRARIES OR FFTW3F_OMP_LIBRARIES)

      target_compile_definitions(lammps PRIVATE -DFFT_FFTW_THREADS)

      target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW}_OMP)

    else()

cmake/Modules/Packages/MSCG.cmake

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ if(DOWNLOAD_MSCG) 
else()

  find_package(MSCG)

  if(NOT MSCG_FOUND)

    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_DIR, or set DOWNLOAD_MSCG=ON to download it")

  endif()

  target_link_libraries(lammps PRIVATE MSCG::MSCG)

endif()

cmake/Modules/Packages/PYTHON.cmake

+2 −2
Original line number Diff line number Diff line 
if(CMAKE_VERSION VERSION_LESS 3.12)

  find_package(PythonLibs REQUIRED) # Deprecated since version 3.12

  target_include_directories(lammps PRIVATE ${PYTHON_INCLUDE_DIR})

  target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARY})

  target_include_directories(lammps PRIVATE ${PYTHON_INCLUDE_DIRS})

  target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARIES})

else()

  find_package(Python REQUIRED COMPONENTS Development)

  target_link_libraries(lammps PRIVATE Python::Python)

cmake/Modules/Packages/USER-MOLFILE.cmake

+2 −1
Original line number Diff line number Diff line 
set(MOLFILE_INCLUDE_DIRS "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")

set(MOLFILE_INCLUDE_DIR "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")

set(MOLFILE_INCLUDE_DIRS "${MOLFILE_INCLUDE_DIR}")

add_library(molfile INTERFACE)

target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS})

# no need to link with -ldl on windows

CRA Git | Maintained and supported by SUSTech CRA and CCSE