4 files changed, 53 insertions, 5 deletions
diff --git a/Source/FieldSolver/SpectralSolver/CMakeLists.txt b/Source/FieldSolver/SpectralSolver/CMakeLists.txt
new file mode 100644
index 000000000..34012aabd
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/CMakeLists.txt
@@ -0,0 +1,30 @@
+target_sources(WarpX
+  PRIVATE
+    SpectralFieldData.cpp
+    SpectralKSpace.cpp
+    SpectralSolver.cpp
+)
+
+if(ENABLE_CUDA)
+    target_sources(WarpX
+      PRIVATE
+        WrapCuFFT.cpp
+    )
+else()
+    target_sources(WarpX
+      PRIVATE
+        WrapFFTW.cpp
+    )
+endif()
+
+if(WarpX_DIMS STREQUAL RZ)
+    target_sources(WarpX
+      PRIVATE
+        SpectralSolverRZ.cpp
+        SpectralFieldDataRZ.cpp
+        SpectralKSpaceRZ.cpp
+    )
+    add_subdirectory(SpectralHankelTransform)
+endif()
+
+add_subdirectory(SpectralAlgorithms)
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt
new file mode 100644
index 000000000..b80091aaf
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt
@@ -0,0 +1,15 @@
+target_sources(WarpX
+  PRIVATE
+    GalileanAlgorithm.cpp
+    PMLPsatdAlgorithm.cpp
+    PsatdAlgorithm.cpp
+    SpectralBaseAlgorithm.cpp
+)
+
+if(WarpX_DIMS STREQUAL RZ)
+    target_sources(WarpX
+      PRIVATE
+        SpectralBaseAlgorithmRZ.cpp
+        PsatdAlgorithmRZ.cpp
+    )
+endif()
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/CMakeLists.txt b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/CMakeLists.txt
new file mode 100644
index 000000000..858ffb137
--- /dev/null
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(WarpX
+  PRIVATE
+    SpectralHankelTransformer.cpp
+    HankelTransform.cpp
+)
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/Make.package b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/Make.package
index a3c22d64a..8bb1d7ef7 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/Make.package
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/Make.package
@@ -1,6 +1,4 @@
-ifeq ($(USE_RZ),TRUE)
-  CEXE_sources += SpectralHankelTransformer.cpp
-  CEXE_sources += HankelTransform.cpp
+CEXE_sources += SpectralHankelTransformer.cpp
+CEXE_sources += HankelTransform.cpp
 
-  VPATH_LOCATIONS   += $(WARPX_HOME)/Source/FieldSolver/SpectralSolver/SpectralHankelTransform
-endif
+VPATH_LOCATIONS   += $(WARPX_HOME)/Source/FieldSolver/SpectralSolver/SpectralHankelTransform