Revert "build: Public Header Relocatability, main branch (2024.06.18.) (

acts-project#3303)" This reverts commit d89cb7d.
paulgessinger · Jul 6, 2024 · 19c84b4 · 19c84b4
1 parent 862db9b
commit 19c84b4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/Alignment/CMakeLists.txt b/Alignment/CMakeLists.txt
@@ -5,7 +5,7 @@ target_include_directories(
   ActsAlignment
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<INSTALL_INTERFACE:include>)
 
 target_link_libraries(
   ActsAlignment
@@ -19,3 +19,4 @@ install(
 install(
   DIRECTORY include/ActsAlignment
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
diff --git a/Fatras/CMakeLists.txt b/Fatras/CMakeLists.txt
@@ -17,7 +17,7 @@ target_include_directories(
   ActsFatras
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<INSTALL_INTERFACE:include>)
 target_link_libraries(
   ActsFatras
   PUBLIC ActsCore)
@@ -30,5 +30,5 @@ install(
 install(
   DIRECTORY include/ActsFatras
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
+  
 add_component_if(Geant4 FatrasGeant4 ACTS_BUILD_FATRAS_GEANT4)
diff --git a/Fatras/Geant4/CMakeLists.txt b/Fatras/Geant4/CMakeLists.txt
@@ -13,7 +13,7 @@ target_include_directories(
   ActsFatrasGeant4
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<INSTALL_INTERFACE:include>)
 target_link_libraries(
   ActsFatrasGeant4
   PUBLIC ActsCore ActsFatras ${Geant4_LIBRARIES})

diff --git a/Plugins/FpeMonitoring/CMakeLists.txt b/Plugins/FpeMonitoring/CMakeLists.txt
@@ -5,7 +5,7 @@ target_include_directories(
   ActsPluginFpeMonitoring
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<INSTALL_INTERFACE:include>)
 
 target_link_libraries(
   ActsPluginFpeMonitoring PUBLIC ActsCore)
@@ -24,7 +24,7 @@ else()
 
   if(dl_LIBRARY)
     target_link_libraries(ActsPluginFpeMonitoring PUBLIC ${dl_LIBRARY})
-
+    
     set(_backtrace_setup_complete FALSE)
 
     if(Backtrace_FOUND)

diff --git a/Plugins/Json/CMakeLists.txt b/Plugins/Json/CMakeLists.txt
@@ -24,7 +24,7 @@ target_include_directories(
   ActsPluginJson
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<INSTALL_INTERFACE:include>)
 target_link_libraries(
   ActsPluginJson PUBLIC ActsCore)
 acts_target_link_libraries_system(

diff --git a/thirdparty/FRNN/CMakeLists.txt.in b/thirdparty/FRNN/CMakeLists.txt.in
@@ -31,6 +31,7 @@ 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})