diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 94dd4f8015..b7a2e1d201 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -355,44 +355,7 @@ else()
   set(CUDA_REQUEST_PIC)
 endif()
 
-if(PKG_VORONOI)
-  find_package(VORO)
-  if(VORO_FOUND)
-    set(DOWNLOAD_VORO_DEFAULT OFF)
-  else()
-    set(DOWNLOAD_VORO_DEFAULT ON)
-  endif()
-  option(DOWNLOAD_VORO "Download and compile the Voro++ library instead of using an already installed one" ${DOWNLOAD_VORO_DEFAULT})
-  if(DOWNLOAD_VORO)
-    message(STATUS "Voro++ download requested - we will build our own")
-    include(ExternalProject)
-
-    if(BUILD_SHARED_LIBS)
-      set(VORO_BUILD_CFLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}}")
-    else()
-      set(VORO_BUILD_CFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}}")
-    endif()
-    string(APPEND VORO_BUILD_CFLAGS ${CMAKE_CXX_FLAGS})
-    set(VORO_BUILD_OPTIONS CXX=${CMAKE_CXX_COMPILER} CFLAGS=${VORO_BUILD_CFLAGS})
-
-    ExternalProject_Add(voro_build
-      URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz
-      URL_MD5 2338b824c3b7b25590e18e8df5d68af9
-      CONFIGURE_COMMAND "" BUILD_COMMAND make ${VORO_BUILD_OPTIONS} BUILD_IN_SOURCE 1 INSTALL_COMMAND ""
-      )
-    ExternalProject_get_property(voro_build SOURCE_DIR)
-    set(VORO_LIBRARIES ${SOURCE_DIR}/src/libvoro++.a)
-    set(VORO_INCLUDE_DIRS ${SOURCE_DIR}/src)
-    list(APPEND LAMMPS_DEPS voro_build)
-  else()
-    find_package(VORO)
-    if(NOT VORO_FOUND)
-      message(FATAL_ERROR "Voro++ library not found. Help CMake to find it by setting VORO_LIBRARY and VORO_INCLUDE_DIR, or set DOWNLOAD_VORO=ON to download it")
-    endif()
-  endif()
-  include_directories(${VORO_INCLUDE_DIRS})
-  list(APPEND LAMMPS_LINK_LIBS ${VORO_LIBRARIES})
-endif()
+include(Packages/VORONOI)
 
 if(PKG_LATTE)
   find_package(LATTE)
diff --git a/cmake/Modules/Packages/VORONOI.cmake b/cmake/Modules/Packages/VORONOI.cmake
new file mode 100644
index 0000000000..df4551b6e7
--- /dev/null
+++ b/cmake/Modules/Packages/VORONOI.cmake
@@ -0,0 +1,38 @@
+if(PKG_VORONOI)
+  find_package(VORO)
+  if(VORO_FOUND)
+    set(DOWNLOAD_VORO_DEFAULT OFF)
+  else()
+    set(DOWNLOAD_VORO_DEFAULT ON)
+  endif()
+  option(DOWNLOAD_VORO "Download and compile the Voro++ library instead of using an already installed one" ${DOWNLOAD_VORO_DEFAULT})
+  if(DOWNLOAD_VORO)
+    message(STATUS "Voro++ download requested - we will build our own")
+    include(ExternalProject)
+
+    if(BUILD_SHARED_LIBS)
+      set(VORO_BUILD_CFLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}}")
+    else()
+      set(VORO_BUILD_CFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTYPE}}")
+    endif()
+    string(APPEND VORO_BUILD_CFLAGS ${CMAKE_CXX_FLAGS})
+    set(VORO_BUILD_OPTIONS CXX=${CMAKE_CXX_COMPILER} CFLAGS=${VORO_BUILD_CFLAGS})
+
+    ExternalProject_Add(voro_build
+      URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz
+      URL_MD5 2338b824c3b7b25590e18e8df5d68af9
+      CONFIGURE_COMMAND "" BUILD_COMMAND make ${VORO_BUILD_OPTIONS} BUILD_IN_SOURCE 1 INSTALL_COMMAND ""
+      )
+    ExternalProject_get_property(voro_build SOURCE_DIR)
+    set(VORO_LIBRARIES ${SOURCE_DIR}/src/libvoro++.a)
+    set(VORO_INCLUDE_DIRS ${SOURCE_DIR}/src)
+    list(APPEND LAMMPS_DEPS voro_build)
+  else()
+    find_package(VORO)
+    if(NOT VORO_FOUND)
+      message(FATAL_ERROR "Voro++ library not found. Help CMake to find it by setting VORO_LIBRARY and VORO_INCLUDE_DIR, or set DOWNLOAD_VORO=ON to download it")
+    endif()
+  endif()
+  include_directories(${VORO_INCLUDE_DIRS})
+  list(APPEND LAMMPS_LINK_LIBS ${VORO_LIBRARIES})
+endif()