From df884fc70cd1b0ab8e63f4cb21bdc40a5d0a87e3 Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Fri, 18 Nov 2022 11:43:41 +0100 Subject: [PATCH] Prepare for FairRoot v18.8 Fix installation of KFParticle and NicaFemto. Add missing dependecy on Vc for KFParticle target. Update the Nicafemto version which adds some missing include statements and forward declarations. The new commit hash also contains a change which corrects all LOG levels to lowercase. --- external/InstallKFParticle.cmake | 3 +++ external/InstallNicaFemto.cmake | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/external/InstallKFParticle.cmake b/external/InstallKFParticle.cmake index e20f9637ff..c3b3040371 100644 --- a/external/InstallKFParticle.cmake +++ b/external/InstallKFParticle.cmake @@ -57,6 +57,9 @@ add_library(KFParticle SHARED IMPORTED GLOBAL) set_target_properties(KFParticle PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle${CMAKE_SHARED_LIBRARY_SUFFIX} INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/include) +target_link_libraries(KFParticle INTERFACE Vc::Vc) + + add_dependencies(KFParticle KFPARTICLE) set(KFParticle_LIB_DIR ${CMAKE_BINARY_DIR}/lib PARENT_SCOPE) diff --git a/external/InstallNicaFemto.cmake b/external/InstallNicaFemto.cmake index f058399887..decdc309f6 100644 --- a/external/InstallNicaFemto.cmake +++ b/external/InstallNicaFemto.cmake @@ -1,4 +1,4 @@ -set(NICAFEMTO_VERSION 402c08b17cb62d92575695d74d36dc4750b7562f) +set(NICAFEMTO_VERSION 73178f31c1b8811fda19e77c89ca3b5944f3d4b8) set(NICAFEMTO_SRC_URL "https://git.cbm.gsi.de/f.uhlig/nicafemto.git") set(NICAFEMTO_DESTDIR "${CMAKE_BINARY_DIR}/external/NICAFEMTO-prefix") -- GitLab