diff --git a/external/InstallHal.cmake b/external/InstallHal.cmake index e4cf62ada2b1c6a316ceedd256e3425938a271aa..6ca1a268a31974a50ff6167f616f4ee960e96e9e 100644 --- a/external/InstallHal.cmake +++ b/external/InstallHal.cmake @@ -1,17 +1,16 @@ -set(HAL_VERSION 9da3fa0b6511765b83409a1804753e4b46ab81a7) +set(HAL_VERSION 9fb2e4528db4a8ffa9205a496b1003c388bb6de8) set(HAL_SRC_URL "https://github.com/DanielWielanek/HAL.git") set(HAL_DESTDIR "${CMAKE_BINARY_DIR}/external/HAL-prefix") list(APPEND HAL_LIB_LIST "HalAna" "HalCut" "HalData" "HalFeatures" "HalFemto") -list(APPEND HAL_LIB_LIST "HalFlow" "HalFluct" "HalSpectra" "HalFair" "HalQA") +list(APPEND HAL_LIB_LIST "HalFlow" "HalFluct" "HalSpectra" "HalQA") download_project_if_needed(PROJECT Hal_source GIT_REPOSITORY ${HAL_SRC_URL} GIT_TAG ${HAL_VERSION} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Hal - PATCH_COMMAND "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/Hal.patch" ) If(ProjectUpdated) @@ -41,6 +40,7 @@ ExternalProject_Add(HAL -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} + -DINCLUDE_HAL_SUBIDIR=TRUE -DROOTSYS=${SIMPATH} -DSIMPATH=${SIMPATH} -DFAIRROOTPATH=${FAIRROOTPATH}