clean up import of target to have them better debuggable with Jens

* adding mesage of imported targets from catalyst
* link catalyst against IPPL (need to put that in an if clause)
* include "catalyst.hpp" in ChargedParticles

Author: felixschurk

CMakeLists.txt

@@ -87,8 +87,14 @@ endif ()
 
 option(ENABLE_CATALYST "Build example with Catalyst enabled" ON)
 if (ENABLE_CATALYST)
-    find_package(catalyst REQUIRED
-            PATHS "${ParaView_DIR}/catalyst")
+  get_property(importTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
+
+  find_package(catalyst REQUIRED)
+  get_property(importTargetsAfter DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
+  list(REMOVE_ITEM importTargetsAfter ${importTargets})
+
+  message("Imported Targets from catalyst:\n ${importTargetsAfter}")
+  # PATHS "${ParaView_DIR}/catalyst")
 endif ()
 
 

alpine/CMakeLists.txt

@@ -13,19 +13,8 @@ link_directories (
 set (IPPL_LIBS ippl ${MPI_CXX_LIBRARIES})
 set (COMPILE_FLAGS ${OPAL_CXX_FLAGS})
 
-add_executable (PenningTrap PenningTrap.cpp
-        CatalystAdaptor.h)
-
-target_compile_definitions(PenningTrap
-        PRIVATE
-        "PARAVIEW_IMPL_DIR=\"${ParaView_CATALYST_DIR}\""
-        ENABLE_CATALYST=1)
-      # target_link_libraries(PenningTrap
-      #         PRIVATE
-      #         catalyst::catalyst
-      #         ${IPPL_LIBS})
-
-target_link_libraries (PenningTrap ${IPPL_LIBS} catalyst::catalyst)
+add_executable (PenningTrap PenningTrap.cpp)
+target_link_libraries (PenningTrap PUBLIC ${IPPL_LIBS})
 
 add_executable (UniformPlasmaTest UniformPlasmaTest.cpp)
 target_link_libraries (UniformPlasmaTest ${IPPL_LIBS})

alpine/ChargedParticles.hpp

@@ -17,6 +17,7 @@
 //
 
 #include "Ippl.h"
+#include <catalyst.hpp>
 
 #include "Solver/ElectrostaticsCG.h"
 #include "Solver/FFTPeriodicPoissonSolver.h"

src/CMakeLists.txt

@@ -95,7 +95,7 @@ include_directories (
 
 add_library ( ippl ${IPPL_SRCS} ${IPPL_SRCS_FORT} )
 
-target_link_libraries(ippl PUBLIC Kokkos::kokkos ${HEFFTE_LIBRARY})
+target_link_libraries(ippl PUBLIC Kokkos::kokkos ${HEFFTE_LIBRARY} catalyst::catalyst)
 
 install (TARGETS ippl DESTINATION lib)
 install (FILES ${IPPL_BASEDIR_HDRS} DESTINATION include)