Don't install Python package from CMakeLists.txt

This commit is contained in:
Paul Romano 2018-01-29 16:30:57 -06:00
parent 6090994545
commit 18695c2878
3 changed files with 6 additions and 22 deletions

View file

@ -506,19 +506,3 @@ install(TARGETS ${program} libopenmc
install(DIRECTORY src/relaxng DESTINATION share/openmc)
install(FILES man/man1/openmc.1 DESTINATION share/man/man1)
install(FILES LICENSE DESTINATION "share/doc/${program}" RENAME copyright)
find_package(PythonInterp)
if(PYTHONINTERP_FOUND)
if(debian)
install(CODE "execute_process(
COMMAND ${PYTHON_EXECUTABLE} setup.py install
--root=debian/openmc --install-layout=deb
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
else()
install(CODE "set(ENV{PYTHONPATH} \"${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages\")")
install(CODE "execute_process(
COMMAND ${PYTHON_EXECUTABLE} setup.py install
--prefix=${CMAKE_INSTALL_PREFIX}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
endif()
endif()

View file

@ -49,9 +49,9 @@ def install(omp=False, mpi=False, phdf5=False):
# Build and install
cmake_cmd.append('..')
print(' '.join(cmake_cmd))
subprocess.call(cmake_cmd)
subprocess.call(['make', '-j'])
subprocess.call(['sudo', 'make', 'install'])
subprocess.check_call(cmake_cmd)
subprocess.check_call(['make', '-j'])
subprocess.check_call(['sudo', 'make', 'install'])
def main():

View file

@ -20,8 +20,8 @@ if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then
pip install pandas==0.20.3
fi
# Build and install
# Build and install OpenMC executable
python tools/ci/travis-install.py
# Install OpenMC in editable mode
pip install -e .[test]
# Install Python API
pip install .[test]