Ticket #54583: patch-splinter-mlpyinstall.2.diff

File patch-splinter-mlpyinstall.2.diff, 2.9 KB (added by repagh (Rene van Paassen), 7 years ago)

updated patch; fixes generation of version files

  • CMakeLists.txt

    old new target_link_libraries(${TEST} ${STATIC_L 
    223223# License file
    224224install(
    225225        FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
    226         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-matlab/
     226        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-matlab/
    227227)
    228228# Matlab files (.m)
    229229install(
    230230        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/matlab
    231         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-matlab
     231        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-matlab
    232232)
    233233# Version file (used for deducing the name of the binary when loading it)
    234234file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/splinter-matlab/version ${VERSION})
    235235install(
     236  FILES ${CMAKE_CURRENT_BINARY_DIR}/splinter-matlab/version
     237  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-matlab)
     238
     239install(
    236240        FILES include/cinterface/cinterface.h
    237         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-matlab/include
     241        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/SPLINTER/splinter-matlab/include
    238242)
    239243install(
    240244        TARGETS ${SHARED_LIBRARY}
    241         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-matlab/lib/${OS_STRING}/${ARCH}
     245        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/SPLINTER/splinter-matlab/lib/${OS_STRING}/${ARCH}
    242246)
    243247
    244248# Make the directory structure expected by the Python interface
    245249install(
    246250        FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
    247         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-python/
     251        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-python/
    248252)
    249253# Python files (.py)
    250254install(
    251255        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python
    252         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-python
     256        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-python
    253257        PATTERN "*.pyc" EXCLUDE
    254258        PATTERN "__pycache__*" EXCLUDE
    255259)
    256260# Version file (used for deducing the name of the binary when loading it)
    257261file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/splinter-python/version ${VERSION})
    258262install(
     263        FILES ${CMAKE_CURRENT_BINARY_DIR}/splinter-python/version
     264        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-python)
     265
     266install(
     267        FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
     268        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/SPLINTER/splinter-python/
     269)
     270install(
    259271        FILES include/cinterface/cinterface.h
    260         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-python/include
     272        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/SPLINTER/splinter-python/include
    261273)
    262274install(
    263275        TARGETS ${SHARED_LIBRARY}
    264         DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/splinter-python/lib/${OS_STRING}/${ARCH}
     276        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/SPLINTER/splinter-python/lib/${OS_STRING}/${ARCH}
    265277)
    266278
    267279# Install the header files (including Eigen) to the header directory