diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index d9c82678eb..514bafe164 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -521,6 +521,9 @@ endif()
 set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_MACHINE})
 set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION})
 install(TARGETS lammps EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(NOT BUILD_SHARED_LIBS)
+ install(CODE "MESSAGE(FATAL_ERROR \"Installing of statici liblammps is currently not supported! Build a shared library with BUILD_SHARED_LIBS=ON\")")
+endif()
 target_include_directories(lammps PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/includes/lammps)
 foreach(_HEADER ${LAMMPS_CXX_HEADERS})
diff --git a/cmake/LAMMPSConfig.cmake.in b/cmake/LAMMPSConfig.cmake.in
index 7cd782b3b8..48c262c664 100644
--- a/cmake/LAMMPSConfig.cmake.in
+++ b/cmake/LAMMPSConfig.cmake.in
@@ -1,4 +1,4 @@
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 include(CMakeFindDependencyMacro)
 if(@BUILD_MPI@)
   find_dependency(MPI REQUIRED CXX)
@@ -8,80 +8,4 @@ if(@PKG_KSPACE@)
     find_dependency(@FFTW@ REQUIRED MODULE)
   endif()
 endif()
-if(NOT @BUILD_SHARED_LIBS@)
-  if(@BUILD_OMP@)
-    find_dependency(OpenMP REQUIRED)
-  endif()
-  if(@WITH_JPEG@)
-    find_dependency(JPEG REQUIRED)
-  endif()
-  if(@WITH_PNG@)
-    find_dependency(PNG REQUIRED)
-    find_dependency(ZLIB REQUIRED)
-  endif()
-  if(@PKG_KIM@)
-    find_dependency(PkgConfig REQUIRED)
-    pkg_check_modules(KIM-API REQUIRED IMPORTED_TARGET libkim-api>=@KIM-API_MIN_VERSION@)
-    if(@CURL_FOUND@)
-      find_dependency(CURL REQUIRED)
-    endif()
-  endif()
-  if(@PKG_USER-SMD@)
-    find_dependency(Eigen3 NO_MODULE REQUIRED)
-  endif()
-  if(@PKG_USER-SCAFACOS@)
-    find_dependency(PkgConfig REQUIRED)
-    find_ependency(GSL REQUIRED)
-    find_dependency(MPI REQUIRED C Fortran)
-    pkg_check_modules(SCAFACOS REQUIRED IMPORTED_TARGET scafacos)
-  endif()
-  if(@PKG_PYTHON@ AND NOT CMAKE_VERSION VERSION_LESS 3.12)
-    find_package(Python REQUIRED COMPONENTS Development)
-  endif()
-  if(@PKG_COMPRESS@)
-    find_dependency(ZLIB REQUIRED)
-  endif()
-  if(@PKG_KOKKOS@)
-    if(@EXTERNAL_KOKKOS@)
-      find_dependency(Kokkos 3 REQUIRED)
-    endif()
-  endif()
-  if(@PKG_VORONOI@)
-    find_dependency(VORO REQUIRED)
-  endif()
-  if(@PKG_USER-INTEL@)
-    if(@INTEL_LRT_MODE@ STREQUAL "THREADS")
-      find_dependency(Threads REQUIRED)
-    endif()
-    if(@TBB_MALLOC_FOUND@)
-      find_ependency(TBB_MALLOC REQUIRED)
-    endif()
-  endif()
-  if(@PKG_USER-ADIOS@)
-    find_ependency(ADIOS2 REQUIRED)
-  endif()
-  if(@PKG_LATTE@)
-    find_ependency(LATTE REQUIRED)
-  endif()
-  if(@PKG_MESSAGE@)
-    if(@MESSAGE_ZMQ@)
-      find_ependency(ZMQ REQUIRED)
-    endif()
-  endif()
-  if(@PKG_MSCG@)
-    find_ependency(GSL REQUIRED)
-    find_ependency(MSCG REQUIRED)
-  endif()
-  if(@USER-NETCDF@)
-    if(@NETCDF_FOUND@)
-      find_ependency(NetCDF REQUIRED)
-    endif()
-    if(@PNETCDF_FOUND@)
-      find_ependency(PNetCDF REQUIRED)
-    endif()
-  endif()
-  if(@PKG_QUIP@)
-    find_ependency(QUIP REQUIRED)
-  endif()
-endif()
 include("${CMAKE_CURRENT_LIST_DIR}/LAMMPS_Targets.cmake")