diff --git a/CMakeLists.txt b/CMakeLists.txt
index f99cbda18c..68f9efa019 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,11 +72,15 @@ endif()
 # ==================================================================================================
 # Install configuration
 
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.14")
+    set(extra_version_arg ARCH_INDEPENDENT)
+endif()
+
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file("${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake"
     VERSION ${JUCE_VERSION}
     COMPATIBILITY ExactVersion
-    ARCH_INDEPENDENT)
+    ${extra_version_arg})
 
 set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING
     "The location, relative to the install prefix, where the JUCE config file will be installed")
diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt
index 7dfa3aea6e..6a4b20ac7c 100644
--- a/extras/Build/juceaide/CMakeLists.txt
+++ b/extras/Build/juceaide/CMakeLists.txt
@@ -49,6 +49,7 @@ else()
 
     # Looks like we're boostrapping, reinvoke CMake
     execute_process(COMMAND "${CMAKE_COMMAND}"
+            "."
             "-B${JUCE_BINARY_DIR}/tools"
             "-G${CMAKE_GENERATOR}"
             "-DCMAKE_BUILD_TYPE=Debug"