File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,5 +25,5 @@ script:
2525
2626 # tests
2727 - cd ${TRAVIS_BUILD_DIR}
28- - export PYTHONPATH=$PYTHONPATH:`pwd`/install/lib/python /site-packages
28+ - export PYTHONPATH=$PYTHONPATH:`pwd`/install/lib/python2.7 /site-packages
2929 - nosetests pyTest
Original file line number Diff line number Diff line change @@ -72,16 +72,23 @@ if(SWIG_FOUND)
7272 endif ()
7373 swig_link_libraries (sequenceparser-py sequenceparser-shared ${PYTHON_LIBRARIES} )
7474
75+ # Get path to install python binding
76+ if (PYTHONLIBS_VERSION_STRING) # CMake >=2.8.11
77+ string (SUBSTRING ${PYTHONLIBS_VERSION_STRING} 0 3 PYTHON_VERSION)
78+ else ()
79+ set (PYTHON_VERSION ${SEQUENCEPARSER_PYTHON_VERSION} )
80+ endif ()
81+ set (SEQUENCEPARSER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHON_VERSION} /site-packages/pySequenceParser/" )
82+
7583 # Install python interface
7684 set (SEQUENCEPARSER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR} /sequenceParser.py" )
77- set (SEQUENCEPARSER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHONLIBS_VERSION_STRING} /site-packages/pySequenceParser/" )
7885 install (
7986 FILES ${SEQUENCEPARSER_PYTHON_BINDING_FILE} ${SEQUENCEPARSER_PYTHON_INIT_FILE}
8087 DESTINATION ${SEQUENCEPARSER_PYTHON_MODULE_OUTPUT_DIR}
8188 OPTIONAL
8289 )
8390 # Install python lib and __init__.py files
84- install (TARGETS ${SWIG_MODULE_sequenceparser-py_REAL_NAME} DESTINATION "lib/python ${PYTHONLIBS_VERSION_STRING} /site-packages/pySequenceParser/ " OPTIONAL )
91+ install (TARGETS ${SWIG_MODULE_sequenceparser-py_REAL_NAME} DESTINATION "${SEQUENCEPARSER_PYTHON_MODULE_OUTPUT_DIR} " OPTIONAL )
8592 install (CODE "file(WRITE ${CMAKE_INSTALL_PREFIX} /${SEQUENCEPARSER_PYTHON_MODULE_OUTPUT_DIR} /__init__.py)" )
8693 else ()
8794 message ("PYTHON not found, will not build python binding." )
You can’t perform that action at this time.
0 commit comments