[CMake] use NiftyPET 2

UCL · Nov 25, 2023 · 23ba669 · 23ba669
1 parent b5c21c3
commit 23ba669
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 88 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -183,8 +183,8 @@ endif()
 
 if(NOT DISABLE_NiftyPET_PROJECTOR)
   if (CUDAToolkit_FOUND)
-    find_package(NiftyPET)
-    if (NiftyPET_FOUND)
+    find_package(NiftyPETnipet COMPONENTS mmr_auxe mmr_lmproc petprj REQUIRED)
+    if (NiftyPETnipet_FOUND)
       set(STIR_WITH_NiftyPET_PROJECTOR ON)
     endif()
   endif()

diff --git a/src/cmake/FindNiftyPET.cmake b/src/cmake/FindNiftyPET.cmake
diff --git a/src/recon_buildblock/CMakeLists.txt b/src/recon_buildblock/CMakeLists.txt
@@ -143,10 +143,7 @@ endif()
 target_link_libraries(recon_buildblock PUBLIC modelling_buildblock display numerics_buildblock listmode_buildblock data_buildblock buildblock spatial_transformation_buildblock )
 
 if (STIR_WITH_NiftyPET_PROJECTOR)
-	target_link_libraries(recon_buildblock PUBLIC NiftyPET::petprj)
-	target_link_libraries(recon_buildblock PUBLIC NiftyPET::mmr_auxe)
-	target_link_libraries(recon_buildblock PUBLIC NiftyPET::mmr_lmproc)
-	target_link_libraries(recon_buildblock PUBLIC CUDA::cudart)
+   target_link_libraries(recon_buildblock PRIVATE NiftyPET::mmr_auxe NiftyPET::mmr_lmproc NiftyPET::petprj)
 endif()
 
 if (STIR_WITH_Parallelproj_PROJECTOR)