diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index d58998574..7d7aa706e 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -29,6 +29,13 @@ find_package(ITK REQUIRED COMPONENTS ${ITK_MODULE_RTK_DEPENDS}) include(itkVersion) if("${ITK_VERSION_MAJOR}" VERSION_LESS "6") include(${ITK_USE_FILE}) + set(RTK_APPLICATION_TARGETS RTK) +else() + itk_generate_factory_registration() + set( + RTK_APPLICATION_TARGETS + ITK::RTKModule;ITK::ITKImageIO;ITK::ITKFFTImageFilterInit + ) endif() #----------------------------------------------------------------------------- diff --git a/applications/rtkadmmtotalvariation/CMakeLists.txt b/applications/rtkadmmtotalvariation/CMakeLists.txt index f1e13b6d6..cbfdd2f37 100644 --- a/applications/rtkadmmtotalvariation/CMakeLists.txt +++ b/applications/rtkadmmtotalvariation/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkadmmtotalvariation.cxx ${rtkadmmtotalvariation_GGO_C} ) -target_link_libraries(rtkadmmtotalvariation RTK) +target_link_libraries(rtkadmmtotalvariation ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkadmmtotalvariation diff --git a/applications/rtkadmmwavelets/CMakeLists.txt b/applications/rtkadmmwavelets/CMakeLists.txt index 97f7a03d1..1520afccb 100644 --- a/applications/rtkadmmwavelets/CMakeLists.txt +++ b/applications/rtkadmmwavelets/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkadmmwavelets.cxx ${rtkadmmwavelets_GGO_C} ) -target_link_libraries(rtkadmmwavelets RTK) +target_link_libraries(rtkadmmwavelets ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkadmmwavelets diff --git a/applications/rtkamsterdamshroud/CMakeLists.txt b/applications/rtkamsterdamshroud/CMakeLists.txt index e42b7fc5b..51241b00b 100644 --- a/applications/rtkamsterdamshroud/CMakeLists.txt +++ b/applications/rtkamsterdamshroud/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkamsterdamshroud.cxx ${rtkamsterdamshroud_GGO_C} ) -target_link_libraries(rtkamsterdamshroud RTK) +target_link_libraries(rtkamsterdamshroud ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkamsterdamshroud diff --git a/applications/rtkbackprojections/CMakeLists.txt b/applications/rtkbackprojections/CMakeLists.txt index af8bbe98e..b6c905c46 100644 --- a/applications/rtkbackprojections/CMakeLists.txt +++ b/applications/rtkbackprojections/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkbackprojections.cxx ${rtkbackprojections_GGO_C} ) -target_link_libraries(rtkbackprojections RTK) +target_link_libraries(rtkbackprojections ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkbackprojections diff --git a/applications/rtkbioscangeometry/CMakeLists.txt b/applications/rtkbioscangeometry/CMakeLists.txt index d1f64bdfe..654eee288 100644 --- a/applications/rtkbioscangeometry/CMakeLists.txt +++ b/applications/rtkbioscangeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkbioscangeometry.cxx ${rtkbioscangeometry_GGO_C} ) -target_link_libraries(rtkbioscangeometry RTK) +target_link_libraries(rtkbioscangeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkbioscangeometry diff --git a/applications/rtkcheckimagequality/CMakeLists.txt b/applications/rtkcheckimagequality/CMakeLists.txt index 7bf037ab0..7c0361ed1 100644 --- a/applications/rtkcheckimagequality/CMakeLists.txt +++ b/applications/rtkcheckimagequality/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkcheckimagequality.cxx ${rtkcheckimagequality_GGO_C} ) -target_link_libraries(rtkcheckimagequality RTK) +target_link_libraries(rtkcheckimagequality ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkcheckimagequality diff --git a/applications/rtkconjugategradient/CMakeLists.txt b/applications/rtkconjugategradient/CMakeLists.txt index 8bad9741b..09f68d3ac 100644 --- a/applications/rtkconjugategradient/CMakeLists.txt +++ b/applications/rtkconjugategradient/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkconjugategradient.cxx ${rtkconjugategradient_GGO_C} ) -target_link_libraries(rtkconjugategradient RTK) +target_link_libraries(rtkconjugategradient ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkconjugategradient diff --git a/applications/rtkdigisensgeometry/CMakeLists.txt b/applications/rtkdigisensgeometry/CMakeLists.txt index a4ebdd7a9..d3df6b18b 100644 --- a/applications/rtkdigisensgeometry/CMakeLists.txt +++ b/applications/rtkdigisensgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkdigisensgeometry.cxx ${rtkdigisensgeometry_GGO_C} ) -target_link_libraries(rtkdigisensgeometry RTK) +target_link_libraries(rtkdigisensgeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkdigisensgeometry diff --git a/applications/rtkdrawgeometricphantom/CMakeLists.txt b/applications/rtkdrawgeometricphantom/CMakeLists.txt index 29e36f9f7..2452a6b54 100644 --- a/applications/rtkdrawgeometricphantom/CMakeLists.txt +++ b/applications/rtkdrawgeometricphantom/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkdrawgeometricphantom.cxx ${rtkdrawgeometricphantom_GGO_C} ) -target_link_libraries(rtkdrawgeometricphantom RTK) +target_link_libraries(rtkdrawgeometricphantom ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkdrawgeometricphantom diff --git a/applications/rtkdrawshepploganphantom/CMakeLists.txt b/applications/rtkdrawshepploganphantom/CMakeLists.txt index 14ee8278d..684d20bc0 100644 --- a/applications/rtkdrawshepploganphantom/CMakeLists.txt +++ b/applications/rtkdrawshepploganphantom/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkdrawshepploganphantom.cxx ${rtkdrawshepploganphantom_GGO_C} ) -target_link_libraries(rtkdrawshepploganphantom RTK) +target_link_libraries(rtkdrawshepploganphantom ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkdrawshepploganphantom diff --git a/applications/rtkelektasynergygeometry/CMakeLists.txt b/applications/rtkelektasynergygeometry/CMakeLists.txt index 4e5a98efd..1e3fbbbce 100644 --- a/applications/rtkelektasynergygeometry/CMakeLists.txt +++ b/applications/rtkelektasynergygeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkelektasynergygeometry.cxx ${rtkelektasynergygeometry_GGO_C} ) -target_link_libraries(rtkelektasynergygeometry RTK) +target_link_libraries(rtkelektasynergygeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkelektasynergygeometry diff --git a/applications/rtkextractphasesignal/CMakeLists.txt b/applications/rtkextractphasesignal/CMakeLists.txt index 21f2fb915..f036bbf71 100644 --- a/applications/rtkextractphasesignal/CMakeLists.txt +++ b/applications/rtkextractphasesignal/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkextractphasesignal.cxx ${rtkextractphasesignal_GGO_C} ) -target_link_libraries(rtkextractphasesignal RTK) +target_link_libraries(rtkextractphasesignal ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkextractphasesignal diff --git a/applications/rtkextractshroudsignal/CMakeLists.txt b/applications/rtkextractshroudsignal/CMakeLists.txt index 0a7bb1903..665d823ff 100644 --- a/applications/rtkextractshroudsignal/CMakeLists.txt +++ b/applications/rtkextractshroudsignal/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkextractshroudsignal.cxx ${rtkextractshroudsignal_GGO_C} ) -target_link_libraries(rtkextractshroudsignal RTK) +target_link_libraries(rtkextractshroudsignal ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkextractshroudsignal diff --git a/applications/rtkfdk/CMakeLists.txt b/applications/rtkfdk/CMakeLists.txt index 9d969c322..bc82e246a 100644 --- a/applications/rtkfdk/CMakeLists.txt +++ b/applications/rtkfdk/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkfdk.cxx ${rtkfdk_GGO_C} ) -target_link_libraries(rtkfdk RTK) +target_link_libraries(rtkfdk ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkfdk diff --git a/applications/rtkfieldofview/CMakeLists.txt b/applications/rtkfieldofview/CMakeLists.txt index 48dac4d62..e3463a91f 100644 --- a/applications/rtkfieldofview/CMakeLists.txt +++ b/applications/rtkfieldofview/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkfieldofview.cxx ${rtkfieldofview_GGO_C} ) -target_link_libraries(rtkfieldofview RTK) +target_link_libraries(rtkfieldofview ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkfieldofview diff --git a/applications/rtkforwardprojections/CMakeLists.txt b/applications/rtkforwardprojections/CMakeLists.txt index 77467f483..6f6fd8fe6 100644 --- a/applications/rtkforwardprojections/CMakeLists.txt +++ b/applications/rtkforwardprojections/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkforwardprojections.cxx ${rtkforwardprojections_GGO_C} ) -target_link_libraries(rtkforwardprojections RTK) +target_link_libraries(rtkforwardprojections ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkforwardprojections diff --git a/applications/rtkfourdconjugategradient/CMakeLists.txt b/applications/rtkfourdconjugategradient/CMakeLists.txt index 26d72f4a3..db455069c 100644 --- a/applications/rtkfourdconjugategradient/CMakeLists.txt +++ b/applications/rtkfourdconjugategradient/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkfourdconjugategradient.cxx ${rtkfourdconjugategradient_GGO_C} ) -target_link_libraries(rtkfourdconjugategradient RTK) +target_link_libraries(rtkfourdconjugategradient ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkfourdconjugategradient diff --git a/applications/rtkfourdfdk/CMakeLists.txt b/applications/rtkfourdfdk/CMakeLists.txt index cb49a7128..7f6d839dc 100644 --- a/applications/rtkfourdfdk/CMakeLists.txt +++ b/applications/rtkfourdfdk/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkfourdfdk.cxx ${rtkfourdfdk_GGO_C} ) -target_link_libraries(rtkfourdfdk RTK) +target_link_libraries(rtkfourdfdk ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkfourdfdk diff --git a/applications/rtkfourdrooster/CMakeLists.txt b/applications/rtkfourdrooster/CMakeLists.txt index 20fbbe586..f6821c633 100644 --- a/applications/rtkfourdrooster/CMakeLists.txt +++ b/applications/rtkfourdrooster/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkfourdrooster.cxx ${rtkfourdrooster_GGO_C} ) -target_link_libraries(rtkfourdrooster RTK) +target_link_libraries(rtkfourdrooster ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkfourdrooster diff --git a/applications/rtkfourdsart/CMakeLists.txt b/applications/rtkfourdsart/CMakeLists.txt index 9822690b6..72a75d93b 100644 --- a/applications/rtkfourdsart/CMakeLists.txt +++ b/applications/rtkfourdsart/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkfourdsart.cxx ${rtkfourdsart_GGO_C} ) -target_link_libraries(rtkfourdsart RTK) +target_link_libraries(rtkfourdsart ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkfourdsart diff --git a/applications/rtkgaincorrection/CMakeLists.txt b/applications/rtkgaincorrection/CMakeLists.txt index 3ec7fdead..bfae3ea70 100644 --- a/applications/rtkgaincorrection/CMakeLists.txt +++ b/applications/rtkgaincorrection/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkgaincorrection.cxx ${rtkgaincorrection_GGO_C} ) -target_link_libraries(rtkgaincorrection RTK) +target_link_libraries(rtkgaincorrection ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkgaincorrection diff --git a/applications/rtkimagxgeometry/CMakeLists.txt b/applications/rtkimagxgeometry/CMakeLists.txt index 3cf8dc1d9..584c597b0 100644 --- a/applications/rtkimagxgeometry/CMakeLists.txt +++ b/applications/rtkimagxgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkimagxgeometry.cxx ${rtkimagxgeometry_GGO_C} ) -target_link_libraries(rtkimagxgeometry RTK) +target_link_libraries(rtkimagxgeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkimagxgeometry diff --git a/applications/rtkiterativefdk/CMakeLists.txt b/applications/rtkiterativefdk/CMakeLists.txt index 6d36f8036..0323314cf 100644 --- a/applications/rtkiterativefdk/CMakeLists.txt +++ b/applications/rtkiterativefdk/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkiterativefdk.cxx ${rtkiterativefdk_GGO_C} ) -target_link_libraries(rtkiterativefdk RTK) +target_link_libraries(rtkiterativefdk ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkiterativefdk diff --git a/applications/rtklagcorrection/CMakeLists.txt b/applications/rtklagcorrection/CMakeLists.txt index db74d0fec..8cf5bf653 100644 --- a/applications/rtklagcorrection/CMakeLists.txt +++ b/applications/rtklagcorrection/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtklagcorrection.cxx ${rtklagcorrection_GGO_C} ) -target_link_libraries(rtklagcorrection RTK) +target_link_libraries(rtklagcorrection ${RTK_APPLICATION_TARGETS}) set_target_properties( rtklagcorrection diff --git a/applications/rtkmaskcollimation/CMakeLists.txt b/applications/rtkmaskcollimation/CMakeLists.txt index 45e32acc2..3d2a405f5 100644 --- a/applications/rtkmaskcollimation/CMakeLists.txt +++ b/applications/rtkmaskcollimation/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkmaskcollimation.cxx ${rtkmaskcollimation_GGO_C} ) -target_link_libraries(rtkmaskcollimation RTK) +target_link_libraries(rtkmaskcollimation ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkmaskcollimation diff --git a/applications/rtkmcfourdconjugategradient/CMakeLists.txt b/applications/rtkmcfourdconjugategradient/CMakeLists.txt index d5aa7a15b..ef18c07a0 100644 --- a/applications/rtkmcfourdconjugategradient/CMakeLists.txt +++ b/applications/rtkmcfourdconjugategradient/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkmcfourdconjugategradient.cxx ${rtkmcfourdconjugategradient_GGO_C} ) -target_link_libraries(rtkmcfourdconjugategradient RTK) +target_link_libraries(rtkmcfourdconjugategradient ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkmcfourdconjugategradient diff --git a/applications/rtkmcrooster/CMakeLists.txt b/applications/rtkmcrooster/CMakeLists.txt index d1439b382..a7c14697b 100644 --- a/applications/rtkmcrooster/CMakeLists.txt +++ b/applications/rtkmcrooster/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkmcrooster.cxx ${rtkmcrooster_GGO_C} ) -target_link_libraries(rtkmcrooster RTK) +target_link_libraries(rtkmcrooster ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkmcrooster diff --git a/applications/rtkorageometry/CMakeLists.txt b/applications/rtkorageometry/CMakeLists.txt index 14378b0d5..b7200218b 100644 --- a/applications/rtkorageometry/CMakeLists.txt +++ b/applications/rtkorageometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkorageometry.cxx ${rtkorageometry_GGO_C} ) -target_link_libraries(rtkorageometry RTK) +target_link_libraries(rtkorageometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkorageometry diff --git a/applications/rtkosem/CMakeLists.txt b/applications/rtkosem/CMakeLists.txt index 76d2fc741..193519bc1 100644 --- a/applications/rtkosem/CMakeLists.txt +++ b/applications/rtkosem/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkosem.cxx ${rtkosem_GGO_C} ) -target_link_libraries(rtkosem RTK) +target_link_libraries(rtkosem ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkosem diff --git a/applications/rtkoverlayphaseandshroud/CMakeLists.txt b/applications/rtkoverlayphaseandshroud/CMakeLists.txt index 442b01a37..3b64a4e4c 100644 --- a/applications/rtkoverlayphaseandshroud/CMakeLists.txt +++ b/applications/rtkoverlayphaseandshroud/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkoverlayphaseandshroud.cxx ${rtkoverlayphaseandshroud_GGO_C} ) -target_link_libraries(rtkoverlayphaseandshroud RTK) +target_link_libraries(rtkoverlayphaseandshroud ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkoverlayphaseandshroud diff --git a/applications/rtkprojectgeometricphantom/CMakeLists.txt b/applications/rtkprojectgeometricphantom/CMakeLists.txt index aabfe8157..866c3adc4 100644 --- a/applications/rtkprojectgeometricphantom/CMakeLists.txt +++ b/applications/rtkprojectgeometricphantom/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkprojectgeometricphantom.cxx ${rtkprojectgeometricphantom_GGO_C} ) -target_link_libraries(rtkprojectgeometricphantom RTK) +target_link_libraries(rtkprojectgeometricphantom ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkprojectgeometricphantom diff --git a/applications/rtkprojectionmatrix/CMakeLists.txt b/applications/rtkprojectionmatrix/CMakeLists.txt index 36f3464d7..26d72b6be 100644 --- a/applications/rtkprojectionmatrix/CMakeLists.txt +++ b/applications/rtkprojectionmatrix/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkprojectionmatrix.cxx ${rtkprojectionmatrix_GGO_C} ) -target_link_libraries(rtkprojectionmatrix RTK) +target_link_libraries(rtkprojectionmatrix ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkprojectionmatrix diff --git a/applications/rtkprojections/CMakeLists.txt b/applications/rtkprojections/CMakeLists.txt index 6d06e0af4..982893afa 100644 --- a/applications/rtkprojections/CMakeLists.txt +++ b/applications/rtkprojections/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkprojections.cxx ${rtkprojections_GGO_C} ) -target_link_libraries(rtkprojections RTK) +target_link_libraries(rtkprojections ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkprojections diff --git a/applications/rtkprojectshepploganphantom/CMakeLists.txt b/applications/rtkprojectshepploganphantom/CMakeLists.txt index fd961792c..fe22024dd 100644 --- a/applications/rtkprojectshepploganphantom/CMakeLists.txt +++ b/applications/rtkprojectshepploganphantom/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkprojectshepploganphantom.cxx ${rtkprojectshepploganphantom_GGO_C} ) -target_link_libraries(rtkprojectshepploganphantom RTK) +target_link_libraries(rtkprojectshepploganphantom ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkprojectshepploganphantom diff --git a/applications/rtkregularizedconjugategradient/CMakeLists.txt b/applications/rtkregularizedconjugategradient/CMakeLists.txt index 3f0c8b305..19cdd5bf8 100644 --- a/applications/rtkregularizedconjugategradient/CMakeLists.txt +++ b/applications/rtkregularizedconjugategradient/CMakeLists.txt @@ -4,7 +4,10 @@ add_executable( rtkregularizedconjugategradient.cxx ${rtkregularizedconjugategradient_GGO_C} ) -target_link_libraries(rtkregularizedconjugategradient RTK) +target_link_libraries( + rtkregularizedconjugategradient + ${RTK_APPLICATION_TARGETS} +) set_target_properties( rtkregularizedconjugategradient diff --git a/applications/rtksart/CMakeLists.txt b/applications/rtksart/CMakeLists.txt index f848e1435..5ef2de4cc 100644 --- a/applications/rtksart/CMakeLists.txt +++ b/applications/rtksart/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtksart.cxx ${rtksart_GGO_C} ) -target_link_libraries(rtksart RTK) +target_link_libraries(rtksart ${RTK_APPLICATION_TARGETS}) set_target_properties( rtksart diff --git a/applications/rtkscatterglarecorrection/CMakeLists.txt b/applications/rtkscatterglarecorrection/CMakeLists.txt index 4f605abe0..04afcd3d6 100644 --- a/applications/rtkscatterglarecorrection/CMakeLists.txt +++ b/applications/rtkscatterglarecorrection/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkscatterglarecorrection.cxx ${rtkscatterglarecorrection_GGO_C} ) -target_link_libraries(rtkscatterglarecorrection RTK) +target_link_libraries(rtkscatterglarecorrection ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkscatterglarecorrection diff --git a/applications/rtksimulatedgeometry/CMakeLists.txt b/applications/rtksimulatedgeometry/CMakeLists.txt index c6b3389ca..379750bd3 100644 --- a/applications/rtksimulatedgeometry/CMakeLists.txt +++ b/applications/rtksimulatedgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtksimulatedgeometry.cxx ${rtksimulatedgeometry_GGO_C} ) -target_link_libraries(rtksimulatedgeometry RTK) +target_link_libraries(rtksimulatedgeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtksimulatedgeometry diff --git a/applications/rtkspectraldenoiseprojections/CMakeLists.txt b/applications/rtkspectraldenoiseprojections/CMakeLists.txt index bedee36cf..c64473237 100644 --- a/applications/rtkspectraldenoiseprojections/CMakeLists.txt +++ b/applications/rtkspectraldenoiseprojections/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkspectraldenoiseprojections.cxx ${rtkspectraldenoiseprojections_GGO_C} ) -target_link_libraries(rtkspectraldenoiseprojections RTK) +target_link_libraries(rtkspectraldenoiseprojections ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkspectraldenoiseprojections diff --git a/applications/rtkspectralforwardmodel/CMakeLists.txt b/applications/rtkspectralforwardmodel/CMakeLists.txt index 90a83c52a..063e033bb 100644 --- a/applications/rtkspectralforwardmodel/CMakeLists.txt +++ b/applications/rtkspectralforwardmodel/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkspectralforwardmodel.cxx ${rtkspectralforwardmodel_GGO_C} ) -target_link_libraries(rtkspectralforwardmodel RTK) +target_link_libraries(rtkspectralforwardmodel ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkspectralforwardmodel diff --git a/applications/rtkspectralonestep/CMakeLists.txt b/applications/rtkspectralonestep/CMakeLists.txt index 808cf0c97..efa775ae7 100644 --- a/applications/rtkspectralonestep/CMakeLists.txt +++ b/applications/rtkspectralonestep/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkspectralonestep.cxx ${rtkspectralonestep_GGO_C} ) -target_link_libraries(rtkspectralonestep RTK) +target_link_libraries(rtkspectralonestep ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkspectralonestep diff --git a/applications/rtkspectralonestep/rtkspectralonestep.sh b/applications/rtkspectralonestep/rtkspectralonestep.sh new file mode 100644 index 000000000..c13a7403c --- /dev/null +++ b/applications/rtkspectralonestep/rtkspectralonestep.sh @@ -0,0 +1,19 @@ +rtkspectralonestep \ + --verbose \ + -i decomposed_init.mha \ + --incident spectrum.mha \ + -d drm.mha \ + -a mat_basis.mha \ + -n 100 \ + --subsets 1 \ + --regul_radius 1,1,1 \ + -s counts.mha \ + -m mask.mha \ + --regul_weights 1000 \ + -g geometry.xml \ + -o decomposed.mha \ + -t 20.,40.,60.,80.,100. \ + --fp CudaRayCast \ + --bp CudaVoxelBased \ + --output-every 1 \ + --iteration-file-name decomposed_iteration%03d.mha diff --git a/applications/rtkspectralrooster/CMakeLists.txt b/applications/rtkspectralrooster/CMakeLists.txt index e2e1cf50a..6e2e0f2cc 100644 --- a/applications/rtkspectralrooster/CMakeLists.txt +++ b/applications/rtkspectralrooster/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkspectralrooster.cxx ${rtkspectralrooster_GGO_C} ) -target_link_libraries(rtkspectralrooster RTK) +target_link_libraries(rtkspectralrooster ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkspectralrooster diff --git a/applications/rtkspectralsimplexdecomposition/CMakeLists.txt b/applications/rtkspectralsimplexdecomposition/CMakeLists.txt index c624ff042..13f1c6410 100644 --- a/applications/rtkspectralsimplexdecomposition/CMakeLists.txt +++ b/applications/rtkspectralsimplexdecomposition/CMakeLists.txt @@ -4,7 +4,10 @@ add_executable( rtkspectralsimplexdecomposition.cxx ${rtkspectralsimplexdecomposition_GGO_C} ) -target_link_libraries(rtkspectralsimplexdecomposition RTK) +target_link_libraries( + rtkspectralsimplexdecomposition + ${RTK_APPLICATION_TARGETS} +) set_target_properties( rtkspectralsimplexdecomposition diff --git a/applications/rtksubselect/CMakeLists.txt b/applications/rtksubselect/CMakeLists.txt index f17e3ff45..4eaab9a27 100644 --- a/applications/rtksubselect/CMakeLists.txt +++ b/applications/rtksubselect/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtksubselect.cxx ${rtksubselect_GGO_C} ) -target_link_libraries(rtksubselect RTK) +target_link_libraries(rtksubselect ${RTK_APPLICATION_TARGETS}) set_target_properties( rtksubselect diff --git a/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt b/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt index d91f4aeb3..bddcbd625 100644 --- a/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt +++ b/applications/rtktotalnuclearvariationdenoising/CMakeLists.txt @@ -4,7 +4,10 @@ add_executable( rtktotalnuclearvariationdenoising.cxx ${rtktotalnuclearvariationdenoising_GGO_C} ) -target_link_libraries(rtktotalnuclearvariationdenoising RTK) +target_link_libraries( + rtktotalnuclearvariationdenoising + ${RTK_APPLICATION_TARGETS} +) set_target_properties( rtktotalnuclearvariationdenoising diff --git a/applications/rtktotalvariationdenoising/CMakeLists.txt b/applications/rtktotalvariationdenoising/CMakeLists.txt index 683be4e32..d8b16bf86 100644 --- a/applications/rtktotalvariationdenoising/CMakeLists.txt +++ b/applications/rtktotalvariationdenoising/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtktotalvariationdenoising.cxx ${rtktotalvariationdenoising_GGO_C} ) -target_link_libraries(rtktotalvariationdenoising RTK) +target_link_libraries(rtktotalvariationdenoising ${RTK_APPLICATION_TARGETS}) set_target_properties( rtktotalvariationdenoising diff --git a/applications/rtktutorialapplication/CMakeLists.txt b/applications/rtktutorialapplication/CMakeLists.txt index 3faf6a962..c7949f750 100644 --- a/applications/rtktutorialapplication/CMakeLists.txt +++ b/applications/rtktutorialapplication/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtktutorialapplication.cxx ${rtktutorialapplication_GGO_C} ) -target_link_libraries(rtktutorialapplication RTK) +target_link_libraries(rtktutorialapplication ${RTK_APPLICATION_TARGETS}) set_target_properties( rtktutorialapplication diff --git a/applications/rtkvarianobigeometry/CMakeLists.txt b/applications/rtkvarianobigeometry/CMakeLists.txt index e26ccb73b..9bc623625 100644 --- a/applications/rtkvarianobigeometry/CMakeLists.txt +++ b/applications/rtkvarianobigeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkvarianobigeometry.cxx ${rtkvarianobigeometry_GGO_C} ) -target_link_libraries(rtkvarianobigeometry RTK) +target_link_libraries(rtkvarianobigeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkvarianobigeometry diff --git a/applications/rtkvarianprobeamgeometry/CMakeLists.txt b/applications/rtkvarianprobeamgeometry/CMakeLists.txt index 235a860af..110034685 100644 --- a/applications/rtkvarianprobeamgeometry/CMakeLists.txt +++ b/applications/rtkvarianprobeamgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkvarianprobeamgeometry.cxx ${rtkvarianprobeamgeometry_GGO_C} ) -target_link_libraries(rtkvarianprobeamgeometry RTK) +target_link_libraries(rtkvarianprobeamgeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkvarianprobeamgeometry diff --git a/applications/rtkvectorconjugategradient/CMakeLists.txt b/applications/rtkvectorconjugategradient/CMakeLists.txt index ab6efec68..9d856bf73 100644 --- a/applications/rtkvectorconjugategradient/CMakeLists.txt +++ b/applications/rtkvectorconjugategradient/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkvectorconjugategradient.cxx ${rtkvectorconjugategradient_GGO_C} ) -target_link_libraries(rtkvectorconjugategradient RTK) +target_link_libraries(rtkvectorconjugategradient ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkvectorconjugategradient diff --git a/applications/rtkwaveletsdenoising/CMakeLists.txt b/applications/rtkwaveletsdenoising/CMakeLists.txt index ac23d8529..924092841 100644 --- a/applications/rtkwaveletsdenoising/CMakeLists.txt +++ b/applications/rtkwaveletsdenoising/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkwaveletsdenoising.cxx ${rtkwaveletsdenoising_GGO_C} ) -target_link_libraries(rtkwaveletsdenoising RTK) +target_link_libraries(rtkwaveletsdenoising ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkwaveletsdenoising diff --git a/applications/rtkxradgeometry/CMakeLists.txt b/applications/rtkxradgeometry/CMakeLists.txt index a527192f9..1b5fa05a1 100644 --- a/applications/rtkxradgeometry/CMakeLists.txt +++ b/applications/rtkxradgeometry/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable( rtkxradgeometry.cxx ${rtkxradgeometry_GGO_C} ) -target_link_libraries(rtkxradgeometry RTK) +target_link_libraries(rtkxradgeometry ${RTK_APPLICATION_TARGETS}) set_target_properties( rtkxradgeometry diff --git a/examples/AddNoise/CMakeLists.txt b/examples/AddNoise/CMakeLists.txt index e1305618d..b9e4caacc 100644 --- a/examples/AddNoise/CMakeLists.txt +++ b/examples/AddNoise/CMakeLists.txt @@ -5,11 +5,17 @@ project(AddNoise) # Find ITK with RTK find_package(ITK REQUIRED COMPONENTS RTK) -include(itkVersion) if("${ITK_VERSION_MAJOR}" VERSION_LESS "6") include(${ITK_USE_FILE}) + set(RTK_EXAMPLE_TARGETS ${ITK_LIBRARIES}) +else() + itk_generate_factory_registration() + set( + RTK_EXAMPLE_TARGETS + ITK::RTKModule;ITK::ITKImageIO;ITK::ITKFFTImageFilterInit + ) endif() # Executable(s) add_executable(AddNoise AddNoise.cxx) -target_link_libraries(AddNoise ${ITK_LIBRARIES}) +target_link_libraries(AddNoise ${RTK_EXAMPLE_TARGETS}) diff --git a/examples/ConjugateGradient/CMakeLists.txt b/examples/ConjugateGradient/CMakeLists.txt index 9e95fc610..5c41fe939 100644 --- a/examples/ConjugateGradient/CMakeLists.txt +++ b/examples/ConjugateGradient/CMakeLists.txt @@ -5,11 +5,17 @@ project(ConjugateGradient) # Find ITK with RTK find_package(ITK REQUIRED COMPONENTS RTK) -include(itkVersion) if("${ITK_VERSION_MAJOR}" VERSION_LESS "6") include(${ITK_USE_FILE}) + set(RTK_EXAMPLE_TARGETS ${ITK_LIBRARIES}) +else() + itk_generate_factory_registration() + set( + RTK_EXAMPLE_TARGETS + ITK::RTKModule;ITK::ITKImageIO;ITK::ITKFFTImageFilterInit + ) endif() # Executable(s) add_executable(ConjugateGradient ConjugateGradient.cxx) -target_link_libraries(ConjugateGradient ${ITK_LIBRARIES}) +target_link_libraries(ConjugateGradient ${RTK_EXAMPLE_TARGETS}) diff --git a/examples/FirstReconstruction/CMakeLists.txt b/examples/FirstReconstruction/CMakeLists.txt index 485771773..6439025ce 100644 --- a/examples/FirstReconstruction/CMakeLists.txt +++ b/examples/FirstReconstruction/CMakeLists.txt @@ -5,15 +5,22 @@ project(FirstReconstruction) # Find ITK with RTK find_package(ITK REQUIRED COMPONENTS RTK) -include(itkVersion) if("${ITK_VERSION_MAJOR}" VERSION_LESS "6") include(${ITK_USE_FILE}) + set(RTK_EXAMPLE_TARGETS ${ITK_LIBRARIES}) +else() + itk_generate_factory_registration() + set( + RTK_EXAMPLE_TARGETS + ITK::RTKModule;ITK::ITKImageIO;ITK::ITKFFTImageFilterInit + ) endif() # Executable(s) add_executable(FirstReconstruction FirstReconstruction.cxx) -target_link_libraries(FirstReconstruction ${ITK_LIBRARIES}) +target_link_libraries(FirstReconstruction ${RTK_EXAMPLE_TARGETS}) + if(${RTK_USE_CUDA}) add_executable(FirstCudaReconstruction FirstCudaReconstruction.cxx) - target_link_libraries(FirstCudaReconstruction ${ITK_LIBRARIES}) + target_link_libraries(FirstCudaReconstruction ${RTK_EXAMPLE_TARGETS}) endif() diff --git a/examples/GeometricPhantom/CMakeLists.txt b/examples/GeometricPhantom/CMakeLists.txt index d88a5b417..3f451efa4 100644 --- a/examples/GeometricPhantom/CMakeLists.txt +++ b/examples/GeometricPhantom/CMakeLists.txt @@ -5,11 +5,17 @@ project(GeometricPhantom) # Find ITK with RTK find_package(ITK REQUIRED COMPONENTS RTK) -include(itkVersion) if("${ITK_VERSION_MAJOR}" VERSION_LESS "6") include(${ITK_USE_FILE}) + set(RTK_EXAMPLE_TARGETS ${ITK_LIBRARIES}) +else() + itk_generate_factory_registration() + set( + RTK_EXAMPLE_TARGETS + ITK::RTKModule;ITK::ITKImageIO;ITK::ITKFFTImageFilterInit + ) endif() # Executable(s) add_executable(GeometricPhantom GeometricPhantom.cxx) -target_link_libraries(GeometricPhantom ${ITK_LIBRARIES}) +target_link_libraries(GeometricPhantom ${RTK_EXAMPLE_TARGETS}) diff --git a/examples/InlineReconstruction/CMakeLists.txt b/examples/InlineReconstruction/CMakeLists.txt index 356f39096..94bd7ab16 100644 --- a/examples/InlineReconstruction/CMakeLists.txt +++ b/examples/InlineReconstruction/CMakeLists.txt @@ -5,11 +5,17 @@ project(InlineReconstruction) # Find ITK with RTK find_package(ITK REQUIRED COMPONENTS RTK) -include(itkVersion) if("${ITK_VERSION_MAJOR}" VERSION_LESS "6") include(${ITK_USE_FILE}) + set(RTK_EXAMPLE_TARGETS ${ITK_LIBRARIES}) +else() + itk_generate_factory_registration() + set( + RTK_EXAMPLE_TARGETS + ITK::RTKModule;ITK::ITKImageIO;ITK::ITKFFTImageFilterInit + ) endif() # Executable(s) add_executable(InlineReconstruction InlineReconstruction.cxx) -target_link_libraries(InlineReconstruction ${ITK_LIBRARIES}) +target_link_libraries(InlineReconstruction ${RTK_EXAMPLE_TARGETS})