From 5aebf1e0ac82f48f7dd1cc4622eec7b54fe6bdd0 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Wed, 17 Jul 2019 12:11:54 +0200
Subject: [PATCH] MaterialPlugin goes away
---
Algorithms/MaterialMapping/CMakeLists.txt | 2 +-
.../include/ACTFW/MaterialMapping/MaterialMapping.hpp | 2 +-
Plugins/Geant4/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Algorithms/MaterialMapping/CMakeLists.txt b/Algorithms/MaterialMapping/CMakeLists.txt
index 63f151b2..c4a75fc6 100644
--- a/Algorithms/MaterialMapping/CMakeLists.txt
+++ b/Algorithms/MaterialMapping/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
add_library(ACTFWMaterialMapping SHARED ${src_files})
target_include_directories(ACTFWMaterialMapping PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/> $<INSTALL_INTERFACE:include>)
-target_link_libraries(ACTFWMaterialMapping PUBLIC ActsCore ActsMaterialMappingPlugin)
+target_link_libraries(ACTFWMaterialMapping PUBLIC ActsCore)
target_link_libraries(ACTFWMaterialMapping PUBLIC ACTFramework)
if (USE_GEANT4)
target_link_libraries(ACTFWMaterialMapping PUBLIC ACTFWGeant4Plugin ACTFWGeometryInterfaces)
diff --git a/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp b/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp
index c5d3dbe6..7c80b4cf 100644
--- a/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp
+++ b/Algorithms/MaterialMapping/include/ACTFW/MaterialMapping/MaterialMapping.hpp
@@ -15,7 +15,7 @@
#include "ACTFW/Framework/BareAlgorithm.hpp"
#include "ACTFW/Framework/ProcessCode.hpp"
#include "ACTFW/MaterialMapping/IMaterialWriter.hpp"
-#include "Acts/Plugins/MaterialMapping/SurfaceMaterialMapper.hpp"
+#include "Acts/Material/SurfaceMaterialMapper.hpp"
#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Plugins/Geant4/CMakeLists.txt b/Plugins/Geant4/CMakeLists.txt
index 7e956722..13bbbd00 100644
--- a/Plugins/Geant4/CMakeLists.txt
+++ b/Plugins/Geant4/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(ACTFWGeant4Plugin SHARED ${src_files})
target_include_directories(ACTFWGeant4Plugin PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/> $<INSTALL_INTERFACE:include>)
target_include_directories(ACTFWGeant4Plugin PUBLIC ${Geant4_INCLUDE_DIRS})
target_include_directories(ACTFWGeant4Plugin PUBLIC ${ROOT_INCLUDE_DIRS})
-target_link_libraries(ACTFWGeant4Plugin PUBLIC ActsCore ActsMaterialMappingPlugin ACTFramework)
+target_link_libraries(ACTFWGeant4Plugin PUBLIC ActsCore ACTFramework)
target_link_libraries(ACTFWGeant4Plugin PUBLIC ${Geant4_LIBRARIES})
target_link_libraries(ACTFWGeant4Plugin PUBLIC ${ROOT_LIBRARIES})
--
GitLab