Skip to content

Commit

Permalink
Made build compatible with virtualenvs by skipping the (fairly useles…
Browse files Browse the repository at this point in the history
…s) specification of python install prefix
  • Loading branch information
Linus Tan committed Dec 20, 2017
1 parent fdfc4d9 commit 56a2ca9
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions swig/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ endif()

set_source_files_properties( gpstk.i PROPERTIES CPLUSPLUS ON )

if( NOT PYTHON_INSTALL_PREFIX )
message( STATUS "PYTHON_INSTALL_PREFIX: Install prefix for python package was not set by user." )
set( PYTHON_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
message( STATUS "PYTHON_INSTALL_PREFIX: Using CMAKE_INSTALL_PREFIX as the default, so that PYTHON_INSTALL_PREFIX = ${PYTHON_INSTALL_PREFIX}" )
endif()

if( DEBUG_SWITCH )
message( STATUS "SWIG_EXECUTABLE = ${SWIG_EXECUTABLE}" )
message( STATUS "SWIG_USE_FILE = ${SWIG_USE_FILE}" )
Expand Down Expand Up @@ -132,7 +126,7 @@ set( SETUP_PY "${MODULE_PATH}/setup.py" )
configure_file( ${SETUP_PY_IN} ${SETUP_PY} )

# Note: For setup.py install options, see https://docs.python.org/2/install/
install( CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --prefix=${PYTHON_INSTALL_PREFIX} WORKING_DIRECTORY ${MODULE_PATH})" )
install( CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install WORKING_DIRECTORY ${MODULE_PATH})" )

#------------------------------------------------------------
# These files aren't required to use the bindings but are
Expand Down

0 comments on commit 56a2ca9

Please sign in to comment.