Unverified Commit 25d0915c authored by Stephan Lachnit's avatar Stephan Lachnit
Browse files

CMake: fix installation of data with CPack 



Signed-off-by: default avatarStephan Lachnit <stephanlachnit@debian.org>
parent 50257b61

models/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ SET(_MODEL_SUFFIX 


# Prefer local models if not installed to other location

GET_FILENAME_COMPONENT(ABSOLUTE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ABSOLUTE)

IF(ABSOLUTE_INSTALL_PREFIX STREQUAL PROJECT_SOURCE_DIR)

IF(ABSOLUTE_INSTALL_PREFIX STREQUAL PROJECT_SOURCE_DIR AND NOT DEFINED ENV{ALLPIX_BUILD_ENV})

    # Use local model directory (unless other is given)

    SET(MODEL_DIRECTORY

        "models"

src/modules/DepositionCosmics/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ ELSE() 
        CACHE PATH "CRY data directory" FORCE)

ENDIF()



SET(DATA_INSTALL_DIRECTORY "${CRY_DATA_DIRECTORY}")

SET(CRY_DATA_INSTALL_DIRECTORY "${CRY_DATA_DIRECTORY}")

IF(NOT IS_ABSOLUTE ${CRY_DATA_DIRECTORY})

    SET(CRY_DATA_DIRECTORY

        "${CMAKE_INSTALL_PREFIX}/${CRY_DATA_DIRECTORY}"
@@ -49,7 +49,7 @@ ENDIF() 
# NOTE: With default install path this does not change anything

INSTALL(

    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data/

    DESTINATION ${CRY_DATA_DIRECTORY}

    DESTINATION ${CRY_DATA_INSTALL_DIRECTORY}

    FILES_MATCHING

    PATTERN "*.data")

src/modules/DepositionLaser/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ ELSE() 
        CACHE PATH "Laser data directory" FORCE)

ENDIF()



SET(LASER_DATA_INSTALL_DIRECTORY "${LASER_DATA_DIRECTORY}")

IF(NOT IS_ABSOLUTE ${LASER_DATA_DIRECTORY})

    SET(LASER_DATA_DIRECTORY

        "${CMAKE_INSTALL_PREFIX}/${LASER_DATA_DIRECTORY}"
@@ -28,7 +29,7 @@ ENDIF() 
# NOTE: With default install path this does not change anything

INSTALL(

    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/

    DESTINATION ${LASER_DATA_DIRECTORY}

    DESTINATION ${LASER_DATA_INSTALL_DIRECTORY}

    FILES_MATCHING

    PATTERN "*.data")