diff --git a/cmake/Modules/FindFFTW3.cmake b/cmake/Modules/FindFFTW3.cmake
index 63752f85df..708ec49509 100644
--- a/cmake/Modules/FindFFTW3.cmake
+++ b/cmake/Modules/FindFFTW3.cmake
@@ -14,14 +14,34 @@ find_path(FFTW3_INCLUDE_DIR fftw3.h HINTS ${PC_FFTW3_INCLUDE_DIRS})
 find_library(FFTW3_LIBRARY NAMES fftw3 HINTS ${PC_FFTW3_LIBRARY_DIRS})
 find_library(FFTW3_OMP_LIBRARY NAMES fftw3_omp HINTS ${PC_FFTW3_LIBRARY_DIRS})
 
-set(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
-set(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
-set(FFTW3_OMP_LIBRARIES ${FFTW3_OMP_LIBRARY})
-
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE
 # if all listed variables are TRUE
 
 find_package_handle_standard_args(FFTW3 DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
 
+# Copy the results to the output variables and target.
+if(FFTW3_FOUND)
+  set(FFTW3_LIBRARIES ${FFTW3_LIBRARY} )
+  set(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR} )
+
+  if(NOT TARGET FFTW3::FFTW3)
+    add_library(FFTW3::FFTW3 UNKNOWN IMPORTED)
+    set_target_properties(FFTW3::FFTW3 PROPERTIES
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION "${FFTW3_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIRS}")
+  endif()
+  if(FFTW3_OMP_LIBRARY)
+    set(FFTW3_OMP_LIBRARIES ${FFTW3_OMP_LIBRARY})
+    if(NOT TARGET FFTW3::FFTW3_OMP)
+      add_library(FFTW3::FFTW3_OMP UNKNOWN IMPORTED)
+      set_target_properties(FFTW3::FFTW3_OMP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+	IMPORTED_LOCATION "${FFTW3_OMP_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${FFTW3_INCLUDE_DIRS}")
+    endif()
+  endif()
+endif()
+
 mark_as_advanced(FFTW3_INCLUDE_DIR FFTW3_LIBRARY FFTW3_OMP_LIBRARY)
diff --git a/cmake/Modules/FindFFTW3F.cmake b/cmake/Modules/FindFFTW3F.cmake
index c67aa5faf1..3dbcdaa04e 100644
--- a/cmake/Modules/FindFFTW3F.cmake
+++ b/cmake/Modules/FindFFTW3F.cmake
@@ -13,14 +13,34 @@ find_path(FFTW3F_INCLUDE_DIR fftw3.h HINTS ${PC_FFTW3F_INCLUDE_DIRS})
 find_library(FFTW3F_LIBRARY NAMES fftw3f HINTS ${PC_FFTW3F_LIBRARY_DIRS})
 find_library(FFTW3F_OMP_LIBRARY NAMES fftw3f_omp HINTS ${PC_FFTW3F_LIBRARY_DIRS})
 
-set(FFTW3F_INCLUDE_DIRS ${FFTW3F_INCLUDE_DIR})
-set(FFTW3F_LIBRARIES ${FFTW3F_LIBRARY})
-set(FFTW3F_OMP_LIBRARIES ${FFTW3F_OMP_LIBRARY})
-
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set FFTW3F_FOUND to TRUE
 # if all listed variables are TRUE
 
 find_package_handle_standard_args(FFTW3F DEFAULT_MSG FFTW3F_LIBRARY FFTW3F_INCLUDE_DIR)
 
-mark_as_advanced(FFTW3F_INCLUDE_DIR FFTW3F_LIBRARY)
+# Copy the results to the output variables and target.
+if(FFTW3F_FOUND)
+  set(FFTW3F_LIBRARIES ${FFTW3F_LIBRARY} )
+  set(FFTW3F_INCLUDE_DIRS ${FFTW3F_INCLUDE_DIR} )
+
+  if(NOT TARGET FFTW3F::FFTW3F)
+    add_library(FFTW3F::FFTW3F UNKNOWN IMPORTED)
+    set_target_properties(FFTW3F::FFTW3F PROPERTIES
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION "${FFTW3F_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${FFTW3F_INCLUDE_DIRS}")
+  endif()
+  if(FFTW3F_OMP_LIBRARY)
+    set(FFTW3F_OMP_LIBRARIES ${FFTW3F_OMP_LIBRARY})
+    if(NOT TARGET FFTW3F::FFTW3F_OMP)
+      add_library(FFTW3F::FFTW3F_OMP UNKNOWN IMPORTED)
+      set_target_properties(FFTW3F::FFTW3F_OMP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+	IMPORTED_LOCATION "${FFTW3F_OMP_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${FFTW3F_INCLUDE_DIRS}")
+    endif()
+  endif()
+endif()
+
+mark_as_advanced(FFTW3F_INCLUDE_DIR FFTW3F_LIBRARY FFTW3F_OMP_LIBRARY)
diff --git a/cmake/Modules/Packages/KSPACE.cmake b/cmake/Modules/Packages/KSPACE.cmake
index 4f92a6963c..db12787013 100644
--- a/cmake/Modules/Packages/KSPACE.cmake
+++ b/cmake/Modules/Packages/KSPACE.cmake
@@ -19,8 +19,7 @@ if(PKG_KSPACE)
   if(FFT STREQUAL "FFTW3")
     find_package(${FFTW} REQUIRED)
     add_definitions(-DFFT_FFTW3)
-    include_directories(${${FFTW}_INCLUDE_DIRS})
-    target_link_libraries(lammps PRIVATE ${${FFTW}_LIBRARIES})
+    target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW})
     if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)
       option(FFT_FFTW_THREADS "Use threaded FFTW library" ON)
     else()
@@ -30,7 +29,7 @@ if(PKG_KSPACE)
     if(FFT_FFTW_THREADS)
       if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)
         add_definitions(-DFFT_FFTW_THREADS)
-	target_link_libraries(lammps PRIVATE ${${FFTW}_OMP_LIBRARIES})
+	target_link_libraries(lammps PRIVATE ${FFTW}::${FFTW}_OMP)
       else()
         message(FATAL_ERROR "Need OpenMP enabled FFTW3 library for FFT_THREADS")
       endif()