Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Public Header Relocatability, main branch (2024.06.18.) #3303

Merged
merged 3 commits into from
Jul 3, 2024
Merged

build: Public Header Relocatability, main branch (2024.06.18.) #3303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9685e4
Made all libraries with public headers use CMAKE_INSTALL_INCLUDEDIR.
krasznaa Jun 18, 2024
c514d1d
Merge branch 'main' into HeaderRelocatability-main-20240618
paulgessinger Jul 3, 2024
f096b98
Merge branch 'main' into HeaderRelocatability-main-20240618
kodiakhq[bot] Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Alignment/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ target_include_directories(
ActsAlignment
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

target_link_libraries(
ActsAlignment
Expand All @@ -19,4 +19,3 @@ install(
install(
DIRECTORY include/ActsAlignment
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

4 changes: 2 additions & 2 deletions Fatras/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ target_include_directories(
ActsFatras
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
target_link_libraries(
ActsFatras
PUBLIC ActsCore)
Expand All @@ -30,5 +30,5 @@ install(
install(
DIRECTORY include/ActsFatras
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

add_component_if(Geant4 FatrasGeant4 ACTS_BUILD_FATRAS_GEANT4)
2 changes: 1 addition & 1 deletion Fatras/Geant4/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ target_include_directories(
ActsFatrasGeant4
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
target_link_libraries(
ActsFatrasGeant4
PUBLIC ActsCore ActsFatras ${Geant4_LIBRARIES})
Expand Down
4 changes: 2 additions & 2 deletions Plugins/FpeMonitoring/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ target_include_directories(
ActsPluginFpeMonitoring
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
$<INSTALL_INTERFACE:include>)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

target_link_libraries(
ActsPluginFpeMonitoring PUBLIC ActsCore)
Expand All @@ -24,7 +24,7 @@ else()

if(dl_LIBRARY)
target_link_libraries(ActsPluginFpeMonitoring PUBLIC ${dl_LIBRARY})

set(_backtrace_setup_complete FALSE)

if(Backtrace_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Json/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ target_include_directories(
ActsPluginJson
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
$<INSTALL_INTERFACE:include>)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
target_link_libraries(
ActsPluginJson PUBLIC ActsCore)
acts_target_link_libraries_system(
Expand Down
1 change: 0 additions & 1 deletion thirdparty/FRNN/CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ target_include_directories(frnn
SYSTEM PUBLIC
${TORCH_INCLUDE_DIRS}
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/frnn/csrc>
$<INSTALL_INTERFACE:include>
)

target_link_libraries(frnn PRIVATE ${TORCH_LIBRARIES})
Expand Down
Loading