Preventing certain projects from showing up in the project's solution

CMakeLists.txt

@@ -58,11 +58,16 @@ include(cmake/CMakeFiles.cmake)
 include(cmake/Projects.cmake)
 
 if(NOT INSTALLED_ENGINE)
+    
     # Add the rest of the targets
     add_subdirectory(Code)
     add_subdirectory(Gems)
-else()
-    ly_find_o3de_packages()
+    add_subdirectory(scripts)
+
+    # SPEC-1417 will investigate and fix this
+    if(NOT PAL_PLATFORM_NAME STREQUAL "Mac")
+        add_subdirectory(Tools/LyTestTools/tests/)
+        add_subdirectory(Tools/RemoteConsole/ly_remote_console/tests/)
     endif()
 
     set(enabled_platforms
@@ -75,18 +80,6 @@ foreach(restricted_platform ${PAL_RESTRICTED_PLATFORMS})
         endif()
     endforeach()
 
-add_subdirectory(scripts)
-
-# SPEC-1417 will investigate and fix this
-if(NOT PAL_PLATFORM_NAME STREQUAL "Mac")
-    add_subdirectory(Tools/LyTestTools/tests/)
-    add_subdirectory(Tools/RemoteConsole/ly_remote_console/tests/)
-endif()
-
-################################################################################
-# Post-processing
-################################################################################
-
     # Loop over the additional external subdirectories and invoke add_subdirectory on them
     foreach(external_directory ${LY_EXTERNAL_SUBDIRS})
         # Hash the extenal_directory name and append it to the Binary Directory section of add_subdirectory
@@ -102,6 +95,13 @@ foreach(external_directory ${LY_EXTERNAL_SUBDIRS})
         add_subdirectory(${external_directory} ${CMAKE_BINARY_DIR}/${directory_name}-${full_directory_hash})
     endforeach()
 
+else()
+    ly_find_o3de_packages()
+endif()
+
+################################################################################
+# Post-processing
+################################################################################
 # The following steps have to be done after all targets are registered:
 # 1. generate a settings registry .setreg file for all ly_add_project_dependencies() and ly_add_target_dependencies() calls
 #    to provide applications with the filenames of gem modules to load
@@ -124,6 +124,6 @@ ly_test_impact_post_step()
 if(NOT INSTALLED_ENGINE)
     ly_setup_o3de_install()
 
-    # IMPORTANT: must be included last
+    # 7. CPack information (to be included after install)
     include(cmake/CPack.cmake)
 endif()

cmake/CMakeFiles.cmake

@@ -9,8 +9,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
+if(NOT INSTALLED_ENGINE)
     # Add all cmake files in a project so they can be handled from within the IDE
     ly_include_cmake_file_list(cmake/cmake_files.cmake)
     add_custom_target(CMakeFiles SOURCES ${ALLFILES})
     ly_source_groups_from_folders("${ALLFILES}")
     unset(ALLFILES)
+endif()