diff --git a/new_editor/CMakeLists.txt b/new_editor/CMakeLists.txt index 6711c9b8..8e338864 100644 --- a/new_editor/CMakeLists.txt +++ b/new_editor/CMakeLists.txt @@ -65,7 +65,7 @@ set(XCUI_EDITOR_COLLECTION_SOURCES ) set(XCUI_EDITOR_SHELL_SOURCES - src/Shell/EditorShellAsset.cpp + src/Shell/UIEditorShellAsset.cpp src/Shell/UIEditorDockHost.cpp src/Shell/UIEditorDockHostInteraction.cpp src/Shell/UIEditorMenuBar.cpp @@ -122,13 +122,13 @@ target_link_libraries(XCUIEditorLib PUBLIC ) add_library(XCUIEditorHost STATIC - app/Host/AutoScreenshot.cpp - app/Host/NativeRenderer.cpp + Host/AutoScreenshot.cpp + Host/NativeRenderer.cpp ) target_include_directories(XCUIEditorHost PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/app + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/engine/include ) @@ -148,8 +148,8 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) ) target_include_directories(XCUIEditorApp PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/app - ${CMAKE_CURRENT_SOURCE_DIR}/src ) target_compile_definitions(XCUIEditorApp PRIVATE @@ -165,6 +165,5 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) set_target_properties(XCUIEditorApp PROPERTIES OUTPUT_NAME "XCUIEditor" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin" ) endif() diff --git a/new_editor/app/Host/AutoScreenshot.cpp b/new_editor/Host/AutoScreenshot.cpp similarity index 100% rename from new_editor/app/Host/AutoScreenshot.cpp rename to new_editor/Host/AutoScreenshot.cpp diff --git a/new_editor/app/Host/AutoScreenshot.h b/new_editor/Host/AutoScreenshot.h similarity index 100% rename from new_editor/app/Host/AutoScreenshot.h rename to new_editor/Host/AutoScreenshot.h diff --git a/new_editor/app/Host/InputModifierTracker.h b/new_editor/Host/InputModifierTracker.h similarity index 100% rename from new_editor/app/Host/InputModifierTracker.h rename to new_editor/Host/InputModifierTracker.h diff --git a/new_editor/app/Host/NativeRenderer.cpp b/new_editor/Host/NativeRenderer.cpp similarity index 100% rename from new_editor/app/Host/NativeRenderer.cpp rename to new_editor/Host/NativeRenderer.cpp diff --git a/new_editor/app/Host/NativeRenderer.h b/new_editor/Host/NativeRenderer.h similarity index 100% rename from new_editor/app/Host/NativeRenderer.h rename to new_editor/Host/NativeRenderer.h diff --git a/new_editor/app/Application.h b/new_editor/app/Application.h index 46c68178..727ef156 100644 --- a/new_editor/app/Application.h +++ b/new_editor/app/Application.h @@ -4,15 +4,11 @@ #define NOMINMAX #endif -#include "Host/AutoScreenshot.h" -#include "Host/InputModifierTracker.h" -#include "Host/NativeRenderer.h" +#include +#include +#include -#include "Shell/EditorShellAsset.h" - -#include -#include -#include +#include #include #include @@ -28,44 +24,6 @@ namespace XCEngine::UI::Editor { -struct StructuredEditorShellBinding { - ::XCEngine::UI::Runtime::UIScreenAsset screenAsset = {}; - UIEditorWorkspaceController workspaceController = {}; - UIEditorShellInteractionDefinition shellDefinition = {}; - UIEditorShortcutManager shortcutManager = {}; - EditorShellAssetValidationResult assetValidation = {}; - - [[nodiscard]] bool IsValid() const { - return assetValidation.IsValid(); - } -}; - -inline UIEditorShortcutManager BuildStructuredEditorShortcutManager( - const EditorShellAsset& asset) { - return BuildEditorShellShortcutManager(asset); -} - -inline StructuredEditorShellBinding BuildStructuredEditorShellBinding( - const EditorShellAsset& asset) { - StructuredEditorShellBinding binding = {}; - binding.screenAsset.screenId = asset.screenId; - binding.screenAsset.documentPath = asset.documentPath.string(); - binding.workspaceController = - UIEditorWorkspaceController(asset.panelRegistry, asset.workspace, asset.workspaceSession); - binding.shellDefinition = asset.shellDefinition; - binding.shortcutManager = BuildStructuredEditorShortcutManager(asset); - binding.assetValidation = ValidateEditorShellAsset(asset); - return binding; -} - -inline UIEditorShellInteractionServices BuildStructuredEditorShellServices( - const StructuredEditorShellBinding& binding) { - UIEditorShellInteractionServices services = {}; - services.commandDispatcher = &binding.shortcutManager.GetCommandDispatcher(); - services.shortcutManager = &binding.shortcutManager; - return services; -} - class Application { public: Application(); diff --git a/new_editor/src/Shell/EditorShellAsset.h b/new_editor/include/XCEditor/Shell/UIEditorShellAsset.h similarity index 95% rename from new_editor/src/Shell/EditorShellAsset.h rename to new_editor/include/XCEditor/Shell/UIEditorShellAsset.h index 32304367..0b4e1b07 100644 --- a/new_editor/src/Shell/EditorShellAsset.h +++ b/new_editor/include/XCEditor/Shell/UIEditorShellAsset.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -15,7 +16,7 @@ namespace XCEngine::UI::Editor { struct EditorShellShortcutAsset { UIEditorCommandRegistry commandRegistry = {}; - std::vector bindings = {}; + std::vector bindings = {}; }; struct EditorShellAsset { diff --git a/new_editor/include/XCEditor/Shell/UIEditorStructuredShell.h b/new_editor/include/XCEditor/Shell/UIEditorStructuredShell.h new file mode 100644 index 00000000..25597e27 --- /dev/null +++ b/new_editor/include/XCEditor/Shell/UIEditorStructuredShell.h @@ -0,0 +1,45 @@ +#pragma once + +#include +#include +#include +#include + +#include + +namespace XCEngine::UI::Editor { + +struct StructuredEditorShellBinding { + ::XCEngine::UI::Runtime::UIScreenAsset screenAsset = {}; + UIEditorWorkspaceController workspaceController = {}; + UIEditorShellInteractionDefinition shellDefinition = {}; + UIEditorShortcutManager shortcutManager = {}; + EditorShellAssetValidationResult assetValidation = {}; + + [[nodiscard]] bool IsValid() const { + return assetValidation.IsValid(); + } +}; + +inline StructuredEditorShellBinding BuildStructuredEditorShellBinding( + const EditorShellAsset& asset) { + StructuredEditorShellBinding binding = {}; + binding.screenAsset.screenId = asset.screenId; + binding.screenAsset.documentPath = asset.documentPath.string(); + binding.workspaceController = + UIEditorWorkspaceController(asset.panelRegistry, asset.workspace, asset.workspaceSession); + binding.shellDefinition = asset.shellDefinition; + binding.shortcutManager = BuildEditorShellShortcutManager(asset); + binding.assetValidation = ValidateEditorShellAsset(asset); + return binding; +} + +inline UIEditorShellInteractionServices BuildStructuredEditorShellServices( + const StructuredEditorShellBinding& binding) { + UIEditorShellInteractionServices services = {}; + services.commandDispatcher = &binding.shortcutManager.GetCommandDispatcher(); + services.shortcutManager = &binding.shortcutManager; + return services; +} + +} // namespace XCEngine::UI::Editor diff --git a/new_editor/src/Shell/EditorShellAsset.cpp b/new_editor/src/Shell/UIEditorShellAsset.cpp similarity index 99% rename from new_editor/src/Shell/EditorShellAsset.cpp rename to new_editor/src/Shell/UIEditorShellAsset.cpp index 2c6b2eca..d5e7f341 100644 --- a/new_editor/src/Shell/EditorShellAsset.cpp +++ b/new_editor/src/Shell/UIEditorShellAsset.cpp @@ -1,4 +1,4 @@ -#include "EditorShellAsset.h" +#include #include #include diff --git a/new_editor/ui/views/editor_shell.xcui b/new_editor/ui/views/editor_shell.xcui deleted file mode 100644 index 932e6058..00000000 --- a/new_editor/ui/views/editor_shell.xcui +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/tests/UI/Editor/CMakeLists.txt b/tests/UI/Editor/CMakeLists.txt index fdf6ce25..97a44411 100644 --- a/tests/UI/Editor/CMakeLists.txt +++ b/tests/UI/Editor/CMakeLists.txt @@ -2,6 +2,17 @@ cmake_minimum_required(VERSION 3.15) project(XCEngine_EditorUITests) +set(XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT + "${CMAKE_SOURCE_DIR}/new_editor") + +if(NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host/AutoScreenshot.h" + OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host/InputModifierTracker.h" + OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host/NativeRenderer.h") + message(FATAL_ERROR + "Editor UI tests expect host headers under " + "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host.") +endif() + add_subdirectory(unit) add_subdirectory(integration) diff --git a/tests/UI/Editor/integration/shared/CMakeLists.txt b/tests/UI/Editor/integration/shared/CMakeLists.txt index 0a7557b9..1aa43387 100644 --- a/tests/UI/Editor/integration/shared/CMakeLists.txt +++ b/tests/UI/Editor/integration/shared/CMakeLists.txt @@ -29,9 +29,8 @@ target_include_directories(editor_ui_integration_host PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_integration_host diff --git a/tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt index 7ee89770..d49658da 100644 --- a/tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_asset_field_basic_validation WIN32 target_include_directories(editor_ui_asset_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt index e05c9c07..6ba72574 100644 --- a/tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_bool_field_basic_validation WIN32 target_include_directories(editor_ui_bool_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt index b50a4090..3e43c8e1 100644 --- a/tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_color_field_basic_validation WIN32 target_include_directories(editor_ui_color_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt index 8810654c..75e3d86a 100644 --- a/tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_context_menu_basic_validation WIN32 target_include_directories(editor_ui_context_menu_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_context_menu_basic_validation PRIVATE diff --git a/tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt index 148840c9..d40ad7a2 100644 --- a/tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_dock_host_basic_validation WIN32 ) target_include_directories(editor_ui_dock_host_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt b/tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt index ad2694dc..c88696de 100644 --- a/tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_editor_shell_compose_validation WIN32 ) target_include_directories(editor_ui_editor_shell_compose_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt b/tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt index 0f7c3d23..499ae1cf 100644 --- a/tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_editor_shell_interaction_validation WIN32 target_include_directories(editor_ui_editor_shell_interaction_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_editor_shell_interaction_validation PRIVATE diff --git a/tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp b/tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp index 89c32616..d9d14708 100644 --- a/tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp +++ b/tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp @@ -2,7 +2,7 @@ #define NOMINMAX #endif -#include "Shell/EditorShellAsset.h" +#include #include #include diff --git a/tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt index 54e5790e..465d3f1b 100644 --- a/tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_enum_field_basic_validation WIN32 target_include_directories(editor_ui_enum_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt index f462c15e..fd1bdef2 100644 --- a/tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_list_view_basic_validation WIN32 ) target_include_directories(editor_ui_list_view_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/list_view_inline_rename/CMakeLists.txt b/tests/UI/Editor/integration/shell/list_view_inline_rename/CMakeLists.txt index 1646685a..38e2bf03 100644 --- a/tests/UI/Editor/integration/shell/list_view_inline_rename/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/list_view_inline_rename/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_list_view_inline_rename_validation WIN32 ) target_include_directories(editor_ui_list_view_inline_rename_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src ) diff --git a/tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt b/tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt index c5ef8939..29866dbc 100644 --- a/tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_list_view_multiselect_validation WIN32 target_include_directories(editor_ui_list_view_multiselect_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt index f3f1a199..f3e3890a 100644 --- a/tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_menu_bar_basic_validation WIN32 target_include_directories(editor_ui_menu_bar_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_menu_bar_basic_validation PRIVATE diff --git a/tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt index 92860fac..0e3fc0e7 100644 --- a/tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_number_field_basic_validation WIN32 target_include_directories(editor_ui_number_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt index a46e58e6..029acbd9 100644 --- a/tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_object_field_basic_validation WIN32 target_include_directories(editor_ui_object_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/panel_content_host_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/panel_content_host_basic/CMakeLists.txt index 9c10c45e..c628d849 100644 --- a/tests/UI/Editor/integration/shell/panel_content_host_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/panel_content_host_basic/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_panel_content_host_basic_validation WIN32 target_include_directories(editor_ui_panel_content_host_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_panel_content_host_basic_validation PRIVATE diff --git a/tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt index c1f08fff..d45caafe 100644 --- a/tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_panel_frame_basic_validation WIN32 ) target_include_directories(editor_ui_panel_frame_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt index 3950119c..f5352d16 100644 --- a/tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_property_grid_basic_validation WIN32 target_include_directories(editor_ui_property_grid_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt index 98cebfb0..c96b8c56 100644 --- a/tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_scroll_view_basic_validation WIN32 ) target_include_directories(editor_ui_scroll_view_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt index 09052c33..dd073be5 100644 --- a/tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_status_bar_basic_validation WIN32 ) target_include_directories(editor_ui_status_bar_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt index bf9a361f..b3696344 100644 --- a/tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_tab_strip_basic_validation WIN32 ) target_include_directories(editor_ui_tab_strip_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt index 86d99a62..a34737a4 100644 --- a/tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_text_field_basic_validation WIN32 target_include_directories(editor_ui_text_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt index 357f689b..c9f57083 100644 --- a/tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_tree_view_basic_validation WIN32 ) target_include_directories(editor_ui_tree_view_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/tree_view_inline_rename/CMakeLists.txt b/tests/UI/Editor/integration/shell/tree_view_inline_rename/CMakeLists.txt index 5c701797..95e5166b 100644 --- a/tests/UI/Editor/integration/shell/tree_view_inline_rename/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tree_view_inline_rename/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_tree_view_inline_rename_validation WIN32 ) target_include_directories(editor_ui_tree_view_inline_rename_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src ) diff --git a/tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt b/tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt index f8063d25..caba7b94 100644 --- a/tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_tree_view_multiselect_validation WIN32 ) target_include_directories(editor_ui_tree_view_multiselect_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt index 438048f3..f5c0b631 100644 --- a/tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_vector2_field_basic_validation WIN32 target_include_directories(editor_ui_vector2_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt index 836093cb..a2b0a1f8 100644 --- a/tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_vector3_field_basic_validation WIN32 target_include_directories(editor_ui_vector3_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt index 6ed0b4c9..69fe40ca 100644 --- a/tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(editor_ui_vector4_field_basic_validation WIN32 target_include_directories(editor_ui_vector4_field_basic_validation PRIVATE ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt index dc544d20..59a2851e 100644 --- a/tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_viewport_shell_basic_validation WIN32 ) target_include_directories(editor_ui_viewport_shell_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt index feff4f18..91bf2626 100644 --- a/tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_viewport_slot_basic_validation WIN32 ) target_include_directories(editor_ui_viewport_slot_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt b/tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt index fb5716ec..3d2203a4 100644 --- a/tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_workspace_interaction_basic_validation WIN32 ) target_include_directories(editor_ui_workspace_interaction_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt b/tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt index ebe19360..87fd0aec 100644 --- a/tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_workspace_shell_compose_validation WIN32 ) target_include_directories(editor_ui_workspace_shell_compose_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt b/tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt index 7904f616..6ccb946c 100644 --- a/tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_workspace_viewport_compose_validation WIN32 ) target_include_directories(editor_ui_workspace_viewport_compose_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt b/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt index b9d26774..61c151b5 100644 --- a/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_layout_persistence_validation WIN32 target_include_directories(editor_ui_layout_persistence_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_layout_persistence_validation PRIVATE diff --git a/tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt b/tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt index fd20d210..abe70663 100644 --- a/tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_panel_host_lifecycle_validation WIN32 target_include_directories(editor_ui_panel_host_lifecycle_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_panel_host_lifecycle_validation PRIVATE diff --git a/tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt b/tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt index 72d44d11..814109ab 100644 --- a/tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_panel_session_flow_validation WIN32 target_include_directories(editor_ui_panel_session_flow_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_panel_session_flow_validation PRIVATE diff --git a/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt b/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt index 11bd51f3..a6822694 100644 --- a/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt @@ -4,9 +4,8 @@ add_executable(editor_ui_shortcut_dispatch_validation WIN32 target_include_directories(editor_ui_shortcut_dispatch_validation PRIVATE ${CMAKE_SOURCE_DIR}/engine/include - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app - ${CMAKE_SOURCE_DIR}/new_editor/src + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ) target_compile_definitions(editor_ui_shortcut_dispatch_validation PRIVATE diff --git a/tests/UI/Editor/integration/state/viewport_input_bridge_basic/CMakeLists.txt b/tests/UI/Editor/integration/state/viewport_input_bridge_basic/CMakeLists.txt index d7271a9a..eb37a9d4 100644 --- a/tests/UI/Editor/integration/state/viewport_input_bridge_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/viewport_input_bridge_basic/CMakeLists.txt @@ -3,8 +3,8 @@ add_executable(editor_ui_viewport_input_bridge_basic_validation WIN32 ) target_include_directories(editor_ui_viewport_input_bridge_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/unit/CMakeLists.txt b/tests/UI/Editor/unit/CMakeLists.txt index 6a3d22b8..a97f4293 100644 --- a/tests/UI/Editor/unit/CMakeLists.txt +++ b/tests/UI/Editor/unit/CMakeLists.txt @@ -73,9 +73,8 @@ target_link_libraries(editor_ui_tests target_include_directories(editor_ui_tests PRIVATE - ${CMAKE_SOURCE_DIR}/new_editor/include - ${CMAKE_SOURCE_DIR}/new_editor/src - ${CMAKE_SOURCE_DIR}/new_editor/app + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include + ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} ${CMAKE_SOURCE_DIR}/engine/include ) diff --git a/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp b/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp index 3f43720f..77b513df 100644 --- a/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp +++ b/tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp @@ -1,6 +1,6 @@ #include -#include "Shell/EditorShellAsset.h" +#include #include diff --git a/tests/UI/Editor/unit/test_structured_editor_shell.cpp b/tests/UI/Editor/unit/test_structured_editor_shell.cpp index a0044d9a..99afaae3 100644 --- a/tests/UI/Editor/unit/test_structured_editor_shell.cpp +++ b/tests/UI/Editor/unit/test_structured_editor_shell.cpp @@ -1,7 +1,7 @@ #include -#include "Application.h" - +#include +#include #include #include #include