jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make PYTHON_INSTDIR a cached variable and implement changes suggested by @junghans

This commit is contained in:
Axel Kohlmeyer 2019-03-26 22:08:53 -04:00
parent 77e323d28c
commit 3867972ae8
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/CMakeLists.txt
View File

@ -1482,7 +1482,7 @@ install(
############################################################################### ###############################################################################
if(BUILD_LIB AND BUILD_SHARED_LIBS) if(BUILD_LIB AND BUILD_SHARED_LIBS)
find_package(PythonInterp) find_package(PythonInterp)
if (${PYTHONINTERP_FOUND}) if (PYTHONINTERP_FOUND)
add_custom_target( add_custom_target(
install-python install-python
${PYTHON_EXECUTABLE} install.py -v ${LAMMPS_SOURCE_DIR}/version.h ${PYTHON_EXECUTABLE} install.py -v ${LAMMPS_SOURCE_DIR}/version.h
@ -1493,12 +1493,12 @@ if(BUILD_LIB AND BUILD_SHARED_LIBS)
else() else()
add_custom_target( add_custom_target(
install-python install-python
echo "Must have Python installed to install the LAMMPS Python module") ${CMAKE_COMMAND} -E echo "Must have Python installed to install the LAMMPS Python module")
endif() endif()
else() else()
add_custom_target( add_custom_target(
install-python install-python
echo "Must build LAMMPS as a shared library to use the Python module") ${CMAKE_COMMAND} -E echo "Must build LAMMPS as a shared library to use the Python module")
endif() endif()
############################################################################### ###############################################################################
@ -1508,12 +1508,11 @@ endif()
############################################################################### ###############################################################################
if((BUILD_LIB AND BUILD_SHARED_LIBS) OR (PKG_PYTHON)) if((BUILD_LIB AND BUILD_SHARED_LIBS) OR (PKG_PYTHON))
find_package(PythonInterp) find_package(PythonInterp)
if (${PYTHONINTERP_FOUND}) if (PYTHONINTERP_FOUND)
if(NOT PYTHON_INSTDIR) execute_process(COMMAND ${PYTHON_EXECUTABLE}
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig as cg; print(cg.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))"
-c "import distutils.sysconfig as cg; print(cg.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))" OUTPUT_VARIABLE PYTHON_DEFAULT_INSTDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_VARIABLE PYTHON_INSTDIR OUTPUT_STRIP_TRAILING_WHITESPACE) set(PYTHON_INSTDIR ${PYTHON_DEFAULT_INSTDIR} CACHE PATH "Installation folder for LAMMPS Python module")
endif()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../python/lammps.py DESTINATION ${PYTHON_INSTDIR}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../python/lammps.py DESTINATION ${PYTHON_INSTDIR})
endif() endif()
endif() endif()