From f4286e5e933177c8ec680a0e3ce6b7cf7fb37fcb Mon Sep 17 00:00:00 2001
From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de>
Date: Sat, 15 Feb 2025 18:05:13 +0100
Subject: [PATCH] external: Fix RUNPATH of KFParticle.
---
external/InstallKFParticle.cmake | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/external/InstallKFParticle.cmake b/external/InstallKFParticle.cmake
index df7073ed30..0e9724197a 100644
--- a/external/InstallKFParticle.cmake
+++ b/external/InstallKFParticle.cmake
@@ -4,7 +4,7 @@ set(KFPARTICLE_SRC_URL "https://github.com/cbmsw/KFParticle.git")
set(KFPARTICLE_DESTDIR "${CMAKE_BINARY_DIR}/external/KFPARTICLE-prefix")
set(KFPARTICLE_TAG "9b11e3e9da4e0896af80701210d19f7ca69c39d4")
-# GIT_TAG is a hash for KFParticle tag cbm/v1.1-1
+# GIT_TAG is a hash for KFParticle tag cbm/v1.1-1
if (CMAKE_SYSTEM_NAME MATCHES Darwin AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm64)
download_project_if_needed(PROJECT kfparticle_source
GIT_REPOSITORY ${KFPARTICLE_SRC_URL}
@@ -34,7 +34,7 @@ endif()
If(ProjectUpdated)
File(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/external/KFPARTICLE-prefix)
- Message("KFParticle source directory was changed so build directory was deleted")
+ Message("KFParticle source directory was changed so build directory was deleted")
EndIf()
if(NOT EXISTS ${CMAKE_BINARY_DIR}/include)
@@ -61,6 +61,8 @@ ExternalProject_Add(KFPARTICLE
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-DCMAKE_MACOSX_RPATH=TRUE
+ -DCMAKE_INSTALL_RPATH=${ROOT_LIBRARY_DIR}
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
)
@@ -73,13 +75,13 @@ target_link_libraries(KFParticle INTERFACE Vc::Vc)
add_dependencies(KFParticle KFPARTICLE)
-Install(FILES ${CMAKE_BINARY_DIR}/lib/${KFPARTICLE_LIBNAME}
+Install(FILES ${CMAKE_BINARY_DIR}/lib/${KFPARTICLE_LIBNAME}
${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle.rootmap
${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle_rdict.pcm
DESTINATION lib
)
-Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticleBase.h
+Install(FILES ${CMAKE_BINARY_DIR}/include/KFParticleBase.h
${CMAKE_BINARY_DIR}/include/KFParticle.h
${CMAKE_BINARY_DIR}/include/KFVertex.h
DESTINATION include/KFParticle
--
GitLab