diff --git a/external/InstallKFParticle.cmake b/external/InstallKFParticle.cmake index 5244ac4988522e394ef9b31650749ffa4c925c94..bd49d4bb97d940357db7e490c445d59c6f1bc99b 100644 --- a/external/InstallKFParticle.cmake +++ b/external/InstallKFParticle.cmake @@ -1,14 +1,14 @@ set(KFPARTICLE_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle${CMAKE_SHARED_LIBRARY_SUFFIX}") -set(KFPARTICLE_SRC_URL "https://git.cbm.gsi.de/CbmSoft/KFParticle.git") +set(KFPARTICLE_SRC_URL "https://github.com/cbmsw/KFParticle.git") set(KFPARTICLE_DESTDIR "${CMAKE_BINARY_DIR}/external/KFPARTICLE-prefix") +# GIT_TAG is a hash for KFParticle tag cbm/v1.1-1 download_project_if_needed(PROJECT kfparticle_source GIT_REPOSITORY ${KFPARTICLE_SRC_URL} - GIT_TAG "98712bbb2e2ae633e16a543ec38fea62a9ca2053" + GIT_TAG "d4e22c8222cc6da877eefa453ade73d31d85e2e9" SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle TEST_FILE CMakeLists.txt - PATCH_COMMAND "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle.patch" ) If(ProjectUpdated) diff --git a/external/KFParticle.patch b/external/KFParticle.patch deleted file mode 100644 index f753a45bcd494f5cf4c017e0a64d09f294284191..0000000000000000000000000000000000000000 --- a/external/KFParticle.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6fbd90c..5a131e9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,11 +12,13 @@ macro(add_target_property _target _prop _value) - endmacro(add_target_property) - - if (CMAKE_VERSION VERSION_LESS "3.1") --if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}") --endif () -+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -+ set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}") -+ endif () - else () -- set (CMAKE_CXX_STANDARD 11) -+ if(NOT CMAKE_CXX_STANDARD) -+ set (CMAKE_CXX_STANDARD 11) -+ endif() - endif () - - list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS} ${ROOTSYS})