diff --git a/UEFIExtract/CMakeLists.txt b/UEFIExtract/CMakeLists.txt
index e12b198..14cd54c 100644
--- a/UEFIExtract/CMakeLists.txt
+++ b/UEFIExtract/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 PROJECT(UEFIExtract)
 
@@ -88,3 +88,8 @@ SET(PROJECT_HEADERS
 ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT -DU_ENABLE_ME_PARSING_SUPPORT  -DU_ENABLE_FIT_PARSING_SUPPORT -DU_ENABLE_GUID_DATABASE_SUPPORT)
 
 ADD_EXECUTABLE(UEFIExtract ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+
+IF (${CMAKE_VERSION} VERSION_EQUAL "3.15.0" OR
+    ${CMAKE_VERSION} VERSION_GREATER "3.15.0")
+  SET_PROPERTY(TARGET UEFIExtract PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+ENDIF()
diff --git a/UEFIFind/CMakeLists.txt b/UEFIFind/CMakeLists.txt
index d54c18d..b4ffe94 100644
--- a/UEFIFind/CMakeLists.txt
+++ b/UEFIFind/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 PROJECT(UEFIFind)
 
@@ -87,3 +87,8 @@ SET(PROJECT_HEADERS
 ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT -DU_ENABLE_FIT_PARSING_SUPPORT -DU_ENABLE_GUID_DATABASE_SUPPORT)
 
 ADD_EXECUTABLE(UEFIFind ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+
+IF (${CMAKE_VERSION} VERSION_EQUAL "3.15.0" OR
+    ${CMAKE_VERSION} VERSION_GREATER "3.15.0")
+  SET_PROPERTY(TARGET UEFIFind PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+ENDIF()