diff --git a/data/vcpkg/ports/vkfft/portfile.cmake b/data/vcpkg/ports/vkfft/portfile.cmake
new file mode 100644
index 0000000000..ab9283298e
--- /dev/null
+++ b/data/vcpkg/ports/vkfft/portfile.cmake
@@ -0,0 +1,12 @@
+# header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DTolm/VkFFT
+    REF e1c58868a9581725dd595975daf780da0a37dad1 #v1.2.31
+    SHA512 b113f0117336ef2f6a285166cb4d68ea372e0dbb46025b7fcbae30f4f5147ad0fb1f7abfd91e1a73e2b4d72446c16ac0e90efc467785e035f176e81d95979706
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/vkFFT/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/VkFFT")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/data/vcpkg/ports/vkfft/vcpkg.json b/data/vcpkg/ports/vkfft/vcpkg.json
new file mode 100644
index 0000000000..6c4076fe48
--- /dev/null
+++ b/data/vcpkg/ports/vkfft/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "vkfft",
+  "version": "1.2.31",
+  "description": "Vulkan/CUDA/HIP/OpenCL/Level Zero Fast Fourier Transform library",
+  "homepage": "https://github.com/DTolm/VkFFT",
+  "license": "MIT"
+}
diff --git a/external/vcpkg b/external/vcpkg
index a2addd4bc5..6accd15d64 160000
--- a/external/vcpkg
+++ b/external/vcpkg
@@ -1 +1 @@
-Subproject commit a2addd4bc5c837747a19a093aa1a493d4c79bdee
+Subproject commit 6accd15d644e93cec849ea346a147828437928b3
diff --git a/include/Core/CastorUtils/Config/BeginExternHeaderGuard.hpp b/include/Core/CastorUtils/Config/BeginExternHeaderGuard.hpp
index 498131eede..6d7e376af2 100644
--- a/include/Core/CastorUtils/Config/BeginExternHeaderGuard.hpp
+++ b/include/Core/CastorUtils/Config/BeginExternHeaderGuard.hpp
@@ -19,6 +19,7 @@ See LICENSE file in root folder
 #pragma warning( disable: 4464 )
 #pragma warning( disable: 4616 )
 #pragma warning( disable: 4619 )
+#pragma warning( disable: 4702 )
 #pragma warning( disable: 4996 )
 #pragma warning( disable: 5031 )
 #pragma warning( disable: 5054 )
diff --git a/source/Plugins/Importers/AssimpImporter/CMakeLists.txt b/source/Plugins/Importers/AssimpImporter/CMakeLists.txt
index 27d305c495..e615154d7a 100644
--- a/source/Plugins/Importers/AssimpImporter/CMakeLists.txt
+++ b/source/Plugins/Importers/AssimpImporter/CMakeLists.txt
@@ -23,14 +23,6 @@ if ( VCPKG_BUILD OR ( VCPKG_TOOLCHAIN AND NOT CASTOR_USE_SYSTEM_ASSIMP ) )
 	set( pugixml_DIR ${VCPKG_SHARE_DIR}/pugixml )
 	set( RapidJSON_DIR ${VCPKG_SHARE_DIR}/rapidjson )
 	set( utf8cpp_DIR ${VCPKG_SHARE_DIR}/utf8cpp )
-	find_package( irrlicht CONFIG QUIET )
-	find_package( polyclipping CONFIG QUIET )
-	find_package( minizip CONFIG QUIET )
-	find_package( kubazip CONFIG QUIET )
-	find_package( poly2tri CONFIG QUIET )
-	find_package( pugixml CONFIG QUIET )
-	find_package( RapidJSON CONFIG QUIET )
-	find_package( utf8cpp CONFIG QUIET )
 	if ( VCPKG_BUILD )
 		find_library( ZLIB_LIBRARY_DEBUG zlib PATHS ${_VCPKG_INSTALLED_DIR}/debug/lib )
 		find_library( ZLIB_LIBRARY_RELEASE zlib PATHS ${_VCPKG_INSTALLED_DIR}/lib )
diff --git a/vcpkg.json b/vcpkg.json
index a008d35487..6daf6951ab 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "castor3d",
   "version": "0.15.0",
-  "builtin-baseline": "648fd374b2e1d8507def23793c8af0cfa89fd0bb",
+  "builtin-baseline": "6accd15d644e93cec849ea346a147828437928b3",
   "dependencies": [
     "convectionkernels",
     "freetype",
@@ -20,8 +20,9 @@
   "vcpkg-configuration": {
     "overlay-ports": [
       "./data/vcpkg/ports/ashes",
+      "./data/vcpkg/ports/rendergraph",
       "./data/vcpkg/ports/shaderwriter",
-      "./data/vcpkg/ports/rendergraph"
+      "./data/vcpkg/ports/vkfft"
     ]
   },
   "features": {