diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index db43fd219b..4983a59134 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -468,9 +468,6 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD)
       install(TARGETS ${PKG_LIB} EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
     set_target_properties(${PKG_LIB} PROPERTIES OUTPUT_NAME lammps_${PKG_LIB}${LAMMPS_LIB_SUFFIX})
-    if(LAMMPS_USE_MPI4WIN)
-      add_dependencies(${PKG_LIB} mpi4win_build)
-    endif()
     target_link_libraries(lammps PRIVATE ${PKG_LIB})
     if(PKG_LIB STREQUAL awpmd)
       target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
diff --git a/cmake/Modules/MPI4WIN.cmake b/cmake/Modules/MPI4WIN.cmake
index 8b8dbd9632..242440b6f6 100644
--- a/cmake/Modules/MPI4WIN.cmake
+++ b/cmake/Modules/MPI4WIN.cmake
@@ -22,5 +22,4 @@ set_target_properties(LAMMPS::MPI PROPERTIES
   IMPORTED_LOCATION "${SOURCE_DIR}/lib/libmpi.a"
   INTERFACE_INCLUDE_DIRECTORIES "${SOURCE_DIR}/include"
   INTERFACE_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX")
-add_dependencies(lammps mpi4win_build)
-set(LAMMPS_USE_MPI4WIN ON)
+add_dependencies(LAMMPS::MPI mpi4win_build)
diff --git a/cmake/Modules/Packages/GPU.cmake b/cmake/Modules/Packages/GPU.cmake
index cbdfdd438f..036bbc68d1 100644
--- a/cmake/Modules/Packages/GPU.cmake
+++ b/cmake/Modules/Packages/GPU.cmake
@@ -108,9 +108,6 @@ if(PKG_GPU)
       endif()
 
       target_link_libraries(lammps PRIVATE gpu)
-      if(LAMMPS_USE_MPI4WIN)
-        add_dependencies(gpu mpi4win_build)
-      endif()
 
       add_executable(nvc_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
       target_compile_definitions(nvc_get_devices PRIVATE -DUCL_CUDADR)
@@ -172,9 +169,6 @@ if(PKG_GPU)
       target_compile_definitions(gpu PRIVATE -DUSE_OPENCL)
 
       target_link_libraries(lammps PRIVATE gpu)
-      if(LAMMPS_USE_MPI4WIN)
-        add_dependencies(gpu mpi4win_build)
-      endif()
 
       add_executable(ocl_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
       target_compile_definitions(ocl_get_devices PRIVATE -DUCL_OPENCL)