Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computing
cbmroot
Commits
f4286e5e
Commit
f4286e5e
authored
1 month ago
by
Felix Weiglhofer
Browse files
Options
Downloads
Patches
Plain Diff
external: Fix RUNPATH of KFParticle.
parent
b862c1c4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2030
external: Fix RUNPATH of KFParticle.
Pipeline
#32985
passed
1 month ago
Stage: build
Stage: package
Stage: verify
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
external/InstallKFParticle.cmake
+6
-4
6 additions, 4 deletions
external/InstallKFParticle.cmake
with
6 additions
and
4 deletions
external/InstallKFParticle.cmake
+
6
−
4
View file @
f4286e5e
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment