Skip to content

Commit

Permalink
Merge branch 'main' into geoShapeToDetVol
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthewharri authored Aug 19, 2024
2 parents d5b763a + d3df140 commit 7608689
Show file tree
Hide file tree
Showing 121 changed files with 3,522 additions and 2,924 deletions.
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,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})
Loading

0 comments on commit 7608689

Please sign in to comment.