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

cmake: consistent usage of find variable

Browse Source
This commit is contained in:
Christoph Junghans
2020-09-08 09:35:45 -06:00
parent d995ed0d87
commit 09b8b117fc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/CMakeLists.txt
View File

@ -318,7 +318,7 @@ if(WITH_JPEG)
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
target_compile_definitions(lammps PRIVATE -DLAMMPS_JPEG) target_compile_definitions(lammps PRIVATE -DLAMMPS_JPEG)
if(CMAKE_VERSION VERSION_LESS 3.12) 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}) target_link_libraries(lammps PRIVATE ${JPEG_LIBRARIES})
else() else()
target_link_libraries(lammps PRIVATE JPEG::JPEG) target_link_libraries(lammps PRIVATE JPEG::JPEG)

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

@ -19,16 +19,16 @@ if(FFT STREQUAL "FFTW3")
find_package(${FFTW} REQUIRED) find_package(${FFTW} REQUIRED)
target_compile_definitions(lammps PRIVATE -DFFT_FFTW3) target_compile_definitions(lammps PRIVATE -DFFT_FFTW3)
target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW}) 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) option(FFT_FFTW_THREADS "Use threaded FFTW library" ON)
else() else()
option(FFT_FFTW_THREADS "Use threaded FFT library" OFF) option(FFT_FFTW_THREADS "Use threaded FFT library" OFF)
endif() endif()
if(FFT_FFTW_THREADS) 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_compile_definitions(lammps PRIVATE -DFFT_FFTW_THREADS)
target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW}_OMP) target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW}_OMP)
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()

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

@ -38,7 +38,7 @@ if(DOWNLOAD_MSCG)
else() else()
find_package(MSCG) find_package(MSCG)
if(NOT MSCG_FOUND) 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() endif()
target_link_libraries(lammps PRIVATE MSCG::MSCG) target_link_libraries(lammps PRIVATE MSCG::MSCG)
endif() endif()

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

@ -1,7 +1,7 @@
if(CMAKE_VERSION VERSION_LESS 3.12) if(CMAKE_VERSION VERSION_LESS 3.12)
find_package(PythonLibs REQUIRED) # Deprecated since version 3.12 find_package(PythonLibs REQUIRED) # Deprecated since version 3.12
target_include_directories(lammps PRIVATE ${PYTHON_INCLUDE_DIR}) target_include_directories(lammps PRIVATE ${PYTHON_INCLUDE_DIRS})
target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARY}) target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARIES})
else() else()
find_package(Python REQUIRED COMPONENTS Development) find_package(Python REQUIRED COMPONENTS Development)
target_link_libraries(lammps PRIVATE Python::Python) target_link_libraries(lammps PRIVATE Python::Python)