diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84a35a2aa5..ed66a23005 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,10 @@
 
 cmake_minimum_required(VERSION 3.12)
 
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+    cmake_policy(SET CMP0091 NEW)
+endif()
+
 project(JUCE VERSION 6.0.8 LANGUAGES C CXX)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS YES)
diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt
index 6f5c640185..e1a26c1ae9 100644
--- a/extras/Build/juceaide/CMakeLists.txt
+++ b/extras/Build/juceaide/CMakeLists.txt
@@ -42,6 +42,9 @@ if(JUCE_BUILD_HELPER_TOOLS)
         juce::juce_recommended_lto_flags
         juce::juce_recommended_warning_flags)
 
+    set_target_properties(juceaide PROPERTIES
+        MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
     export(TARGETS juceaide
            NAMESPACE juce_tools::
            FILE "${JUCE_BINARY_DIR}/JUCEToolsExport.cmake")