Commit c163dc51 authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'install_shared' into 'master' 

Install Module Data

Closes #263

See merge request allpix-squared/allpix-squared!967
parents 43c0c7ec 59b84d48

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ stages: 
            - build

            - bin

            - lib

            - share

        expire_in: 24 hour



# Ensure that our LXPLUS setup script is functional:

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ ADD_DEFINITIONS(-DALLPIX_PROJECT_NAME="${CMAKE_PROJECT_NAME}" -DALLPIX_PROJECT_V 


# Read possible build environment

IF(DEFINED ENV{ALLPIX_BUILD_ENV})

    MESSAGE(STATUS "Building in environment \"$ENV{ALLPIX_BUILD_ENV}\"")

    ADD_DEFINITIONS(-DALLPIX_BUILD_ENV=\"$ENV{ALLPIX_BUILD_ENV}\")

ENDIF()

src/modules/DepositionCosmics/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ADD_DEPENDENCIES(${MODULE_NAME} fetch_cry_data) 


# Prefer local data files 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 data directory (unless other is given)

    SET(CRY_DATA_DIRECTORY

        "${CMAKE_CURRENT_BINARY_DIR}/data"

src/modules/DepositionLaser/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ALLPIX_UNIQUE_MODULE(MODULE_NAME) 


# Prefer local data files 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 data directory (unless other is given)

    SET(LASER_DATA_DIRECTORY

        "${CMAKE_CURRENT_SOURCE_DIR}/data"