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

small CMake tweaks and cleanups

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-12-09 10:28:12 -05:00
parent c4ee2f2e42
commit ddcd5a3c2e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,14 +12,14 @@ option(MLIAP_ENABLE_PYTHON "Build MLIAP package with Python support" ${MLIAP_ENA
if(MLIAP_ENABLE_PYTHON) if(MLIAP_ENABLE_PYTHON)
find_package(Cythonize REQUIRED) find_package(Cythonize REQUIRED)
if(NOT PKG_PYTHON) if(NOT PKG_PYTHON)
message(FATAL_ERROR "Must install PYTHON package for MLIAP with Python support") message(FATAL_ERROR "Must enable PYTHON package for including Python support in MLIAP")
endif() endif()
set(MLIAP_CYTHON_DIR ${CMAKE_BINARY_DIR}/cython) set(MLIAP_CYTHON_DIR ${CMAKE_BINARY_DIR}/cython)
file(MAKE_DIRECTORY ${MLIAP_CYTHON_DIR}) file(MAKE_DIRECTORY ${MLIAP_CYTHON_DIR})
add_custom_command(OUTPUT ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.cpp ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.h add_custom_command(OUTPUT ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.cpp ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.h
COMMAND ${CMAKE_COMMAND} -E copy ${LAMMPS_SOURCE_DIR}/MLIAP/mliap_model_python_couple.pyx ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.pyx COMMAND ${CMAKE_COMMAND} -E copy ${LAMMPS_SOURCE_DIR}/MLIAP/mliap_model_python_couple.pyx ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.pyx
COMMAND ${Cythonize_EXECUTABLE} ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.pyx -3 COMMAND ${Cythonize_EXECUTABLE} -3 ${MLIAP_CYTHON_DIR}/mliap_model_python_couple.pyx
WORKING_DIRECTORY ${MLIAP_CYTHON_DIR} WORKING_DIRECTORY ${MLIAP_CYTHON_DIR}
MAIN_DEPENDENCY ${LAMMPS_SOURCE_DIR}/MLIAP/mliap_model_python_couple.pyx MAIN_DEPENDENCY ${LAMMPS_SOURCE_DIR}/MLIAP/mliap_model_python_couple.pyx
COMMENT "Generating C++ sources with cythonize...") COMMENT "Generating C++ sources with cythonize...")

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

@ -4,7 +4,6 @@ if(CMAKE_VERSION VERSION_LESS 3.12)
target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARIES}) target_link_libraries(lammps PRIVATE ${PYTHON_LIBRARIES})
else() else()
find_package(Python REQUIRED COMPONENTS Development) find_package(Python REQUIRED COMPONENTS Development)
target_include_directories(lammps PRIVATE ${Python_INCLUDE_DIRS})
target_link_libraries(lammps PRIVATE Python::Python) target_link_libraries(lammps PRIVATE Python::Python)
endif() endif()
target_compile_definitions(lammps PRIVATE -DLMP_PYTHON) target_compile_definitions(lammps PRIVATE -DLMP_PYTHON)