Skip to content

Commit

Permalink
Merge branch 'main' into navigator-check-inside-volume
Browse files Browse the repository at this point in the history
  • Loading branch information
andiwand authored Aug 21, 2024
2 parents cdaa004 + 8246a1b commit 6aeb719
Show file tree
Hide file tree
Showing 189 changed files with 4,586 additions and 3,333 deletions.
13 changes: 0 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -373,19 +373,6 @@ linux_ubuntu_2204_clang:
- ctest --test-dir build -j$(nproc)


lcg_104:
<<: *lcg_base_job

variables:
LCG_VERSION: "104"

parallel:
matrix:
- OS: [alma9]
COMPILER:
- gcc13
- clang16

lcg_105:
<<: *lcg_base_job

Expand Down
8 changes: 8 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ repos:
rev: v3.2.0
hooks:
- id: trailing-whitespace
exclude: \.(diff|patch)$
- id: end-of-file-fixer
exclude: \.(diff|patch)$
- id: check-yaml
- id: check-added-large-files

Expand All @@ -20,3 +22,9 @@ repos:
rev: 24.4.2
hooks:
- id: black-jupyter

- repo: https://github.com/BlankSpruce/gersemi
rev: 0.15.0
hooks:
- id: gersemi
args: ["-i", "--no-warn-about-unknown-commands"]
27 changes: 12 additions & 15 deletions Alignment/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
add_library(ActsAlignment SHARED
src/Kernel/detail/AlignmentEngine.cpp)
add_library(ActsAlignment SHARED src/Kernel/detail/AlignmentEngine.cpp)

target_include_directories(
ActsAlignment
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
ActsAlignment
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)

target_link_libraries(
ActsAlignment
PUBLIC ActsCore)
target_link_libraries(ActsAlignment PUBLIC ActsCore)

install(
TARGETS ActsAlignment
EXPORT ActsAlignmentTargets
TARGETS ActsAlignment
EXPORT ActsAlignmentTargets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(
DIRECTORY include/ActsAlignment
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(DIRECTORY include/ActsAlignment DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
Binary file not shown.
Loading

0 comments on commit 6aeb719

Please sign in to comment.