diff --git a/cmake/3rdParty.cmake b/cmake/3rdParty.cmake
index 7385f34e5a..eb11404237 100644
--- a/cmake/3rdParty.cmake
+++ b/cmake/3rdParty.cmake
@@ -313,6 +313,9 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/3rdParty)
 ly_get_absolute_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/3rdParty/Platform/${PAL_PLATFORM_NAME})
 list(APPEND CMAKE_MODULE_PATH ${pal_dir})
 
-ly_include_cmake_file_list(cmake/3rdParty/cmake_files.cmake)
-ly_get_absolute_pal_filename(pal_3rdparty_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdParty/Platform/${PAL_PLATFORM_NAME})
-ly_include_cmake_file_list(${pal_3rdparty_dir}/cmake_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake)
+if(NOT INSTALLED_ENGINE)
+    # Add the 3rdParty cmake files to the IDE
+    ly_include_cmake_file_list(cmake/3rdParty/cmake_files.cmake)
+    ly_get_absolute_pal_filename(pal_3rdparty_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdParty/Platform/${PAL_PLATFORM_NAME})
+    ly_include_cmake_file_list(${pal_3rdparty_dir}/cmake_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake)
+endif()
\ No newline at end of file
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index b56f5ced85..73a3273dfa 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -9,5 +9,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-ly_get_absolute_pal_filename(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Platform/${PAL_PLATFORM_NAME})
-include(${pal_dir}/Install_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
\ No newline at end of file
+if(NOT INSTALLED_ENGINE)
+    ly_get_absolute_pal_filename(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Platform/${PAL_PLATFORM_NAME})
+    include(${pal_dir}/Install_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
+else()
+    
+    # Provide empty implementation so ly_add_target continues working
+    function(ly_install_target ly_install_target_NAME)
+    endfunction()
+
+endif()
\ No newline at end of file
diff --git a/cmake/LYPython.cmake b/cmake/LYPython.cmake
index ff5132097c..546d5f66db 100644
--- a/cmake/LYPython.cmake
+++ b/cmake/LYPython.cmake
@@ -265,10 +265,11 @@ if (NOT CMAKE_SCRIPT_MODE_FILE)
 
         # we also need to make sure any custom packages are installed.
         # this costs a moment of time though, so we'll only do it based on stamp files.
-
-        ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/LyTestTools ly-test-tools)
-        ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/RemoteConsole/ly_remote_console ly-remote-console)
-        ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools editor-python-test-tools)
+        if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND NOT INSTALLED_ENGINE)
+            ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/LyTestTools ly-test-tools)
+            ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/RemoteConsole/ly_remote_console ly-remote-console)
+            ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools editor-python-test-tools)
+        endif()
     endif()
 endif()
 
diff --git a/cmake/cmake_files.cmake b/cmake/cmake_files.cmake
index 5045a42cbe..bd5976b494 100644
--- a/cmake/cmake_files.cmake
+++ b/cmake/cmake_files.cmake
@@ -12,6 +12,7 @@
 set(FILES
     3rdParty.cmake
     3rdPartyPackages.cmake
+    CMakeFiles.cmake
     CommandExecution.cmake
     Configurations.cmake
     CPack.cmake