Skip to content
Snippets Groups Projects
Commit e5b17420 authored by Daniel Wielanek's avatar Daniel Wielanek Committed by Administrator
Browse files

Bump hash to get updated HAL version + remove now unused patch.

parent a2f6d0ff
No related branches found
No related tags found
No related merge requests found
set(HAL_VERSION 9da3fa0b6511765b83409a1804753e4b46ab81a7) set(HAL_VERSION 9fb2e4528db4a8ffa9205a496b1003c388bb6de8)
set(HAL_SRC_URL "https://github.com/DanielWielanek/HAL.git") set(HAL_SRC_URL "https://github.com/DanielWielanek/HAL.git")
set(HAL_DESTDIR "${CMAKE_BINARY_DIR}/external/HAL-prefix") set(HAL_DESTDIR "${CMAKE_BINARY_DIR}/external/HAL-prefix")
list(APPEND HAL_LIB_LIST "HalAna" "HalCut" "HalData" "HalFeatures" "HalFemto") 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 download_project_if_needed(PROJECT Hal_source
GIT_REPOSITORY ${HAL_SRC_URL} GIT_REPOSITORY ${HAL_SRC_URL}
GIT_TAG ${HAL_VERSION} GIT_TAG ${HAL_VERSION}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Hal SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Hal
PATCH_COMMAND "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/Hal.patch"
) )
If(ProjectUpdated) If(ProjectUpdated)
...@@ -41,6 +40,7 @@ ExternalProject_Add(HAL ...@@ -41,6 +40,7 @@ ExternalProject_Add(HAL
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DINCLUDE_HAL_SUBIDIR=TRUE
-DROOTSYS=${SIMPATH} -DROOTSYS=${SIMPATH}
-DSIMPATH=${SIMPATH} -DSIMPATH=${SIMPATH}
-DFAIRROOTPATH=${FAIRROOTPATH} -DFAIRROOTPATH=${FAIRROOTPATH}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment