diff --git a/docs/plan/XCUI_NewEditor收口重构计划_2026-04-17.md b/docs/plan/XCUI_NewEditor收口重构计划_2026-04-17.md index 6dd72739..b0298f22 100644 --- a/docs/plan/XCUI_NewEditor收口重构计划_2026-04-17.md +++ b/docs/plan/XCUI_NewEditor收口重构计划_2026-04-17.md @@ -13,7 +13,7 @@ - `Phase 3`：部分完成 - `Phase 4`：部分完成 - `Phase 5`：基本完成 -- `Phase 6`：大体完成但未完全收尾 +- `Phase 6`：基本完成 - `Phase 7`：未完成 ### 已完成事项 @@ -42,19 +42,27 @@ - 已承载 viewport 默认 shell 配置 - `PanelContentHost` 已直接从 registry 派生外部 host 装配，不再依赖额外 bindings 列表 -7. target graph 已完成第一步收口： +7. target graph 已完成一轮新的收口： - `XCUIEditorAppLib` 已从 `XCUIEditorApp` 可执行目标中拆出 - app 业务层不再全部内联在 exe target 中 + - `XCUIEditorLib` 已改为 `PRIVATE` 链接 `XCEngine` + - 当前 consumer 改为通过显式公开的 engine include root 获取编译所需头文件，而不再继承整个 engine link interface 8. `window-workspace` 全局约束已再补一刀： - 已补跨窗口 `panelId` 唯一性校验 - 已补对应窗口工作区单元测试 +9. integration 测试构建模板已继续收口： + - 已把 `tests/UI/Editor/integration` 叶子目标收敛到 shared helper + - 重复的 include / compile definition / link 模板已明显减少 + - helper 内已统一 `/utf-8`、`/FS` 与 `MSVC_RUNTIME_LIBRARY` 配置 + - `editor_ui_integration_tests` 已恢复全量可构建 + ### 当前仍未完成的关键缺口 1. `Milestone A` 未完成： - - `XCUIEditorLib` 仍然 `PUBLIC` 依赖整个 `XCEngine` - - UI `Core / Runtime / Editor / App` 还未真正拆成清晰 target graph + - `XCUIEditorLib` 虽已不再 `PUBLIC` 依赖整个 `XCEngine`，但 public header 仍直接暴露部分 engine 头文件 + - UI `Core / Runtime / Editor / App` 还未真正拆成清晰 target graph，当前只是先收紧了 transitive link boundary 2. `Milestone B` 未完成： - `PanelRegistry` 仍未成为完整的 runtime factory / lifecycle 入口 @@ -63,11 +71,13 @@ 3. `Milestone C` 未完成： - `XCUIEditorLib / XCUIEditorHost / XCUIEditorApp` 等 target 命名尚未统一收口 + - integration 构建已恢复，但 warning 口径与测试运行入口说明还未统一 - 文档体系尚未全面同步当前结构 ### 最近一次已验证通过 - `cmake --build . --config Debug --target editor_ui_tests` +- `cmake --build . --config Debug --target editor_ui_integration_tests` - `cmake --build . --config Debug --target XCUIEditorApp` - `.\tests\UI\Editor\unit\Debug\editor_ui_tests.exe --gtest_filter=UIEditorWindowWorkspaceControllerTest.*` - `.\tests\UI\Editor\unit\Debug\editor_ui_tests.exe` @@ -81,13 +91,15 @@ - `UIEditorWorkspaceComposeTest.*` - `UIEditorWindowWorkspaceControllerTest.*` - 全量 `editor_ui_tests` 已通过：`337` 个测试全部通过 +- `editor_ui_integration_tests` 已恢复全量构建通过 +- 当前残留构建噪音主要是若干非阻塞 `LNK4199`（`/DELAYLOAD:assimp-vc143-mt.dll`）warning ### 接下来优先级 为尽快收口，后续优先顺序调整为： -1. 优先继续压缩 `XCUIEditorLib` 的对外依赖面 -2. 继续补齐 `window-workspace / transfer` 剩余不变式和状态机约束 +1. 继续补齐 `window-workspace / transfer` 剩余不变式和状态机约束 +2. 继续压缩 `XCUIEditorLib` public header 对 `XCEngine` 的真实暴露面 3. 最后统一 target/public API 命名和文档口径 ## 1. 文档定位 @@ -116,7 +128,7 @@ 现状： - `engine/CMakeLists.txt` 中 UI Core/Runtime 只是 `XCEngine` 大静态库中的一部分 -- `new_editor/CMakeLists.txt` 中 `XCUIEditorLib` 直接 `PUBLIC` 依赖整个 `XCEngine` +- `new_editor/CMakeLists.txt` 曾经让 `XCUIEditorLib` 直接 `PUBLIC` 依赖整个 `XCEngine`，当前已先收紧为 `PRIVATE` 链接并显式暴露必要 include root - Editor 层没有被限制只能依赖 UI Core/Runtime 的最小子集 结果： @@ -416,6 +428,13 @@ - editor 公共库层可以不依赖整个 `XCEngine` 大 target - app 层和库层的依赖方向可在 CMake 上直接读出来 +### 当前进展（更新于 `2026-04-17`） + +- `XCUIEditorAppLib` 已从 exe 启动层中拆出 +- `XCUIEditorLib` 已改为 `PRIVATE` 链接 `XCEngine` +- 为兼容当前 public header 暴露的 engine 头文件，已显式公开 `engine/include` 与 `engine/include/XCEngine` +- 尚未把 UI Core/Runtime 从 `XCEngine` 进一步拆成独立 target + ## Phase 2：Panel 单一事实源收口 ### 目标 @@ -606,6 +625,15 @@ - 团队能明确说出“库层测试在哪，app 层测试在哪” - 不再存在无法编译或未接入的历史测试死目录 +### 当前进展（更新于 `2026-04-17`） + +- `tests/NewEditor` 已删除 +- `tests/UI/Editor/unit` 已停止直接编译 `new_editor/app` 私有 `.cpp` +- `tests/UI/Editor/integration` 叶子目标 CMake 已收敛到 shared helper +- helper 内已统一 `/utf-8`、`/FS` 与 `MSVC_RUNTIME_LIBRARY` +- `editor_ui_integration_tests` 已恢复全量构建通过 +- 尚未统一 integration warning 口径与运行入口文档 + ## Phase 7：命名与文档收口 ### 目标 diff --git a/new_editor/CMakeLists.txt b/new_editor/CMakeLists.txt index d4f07c86..b6c2ba00 100644 --- a/new_editor/CMakeLists.txt +++ b/new_editor/CMakeLists.txt @@ -27,6 +27,11 @@ set(XCUI_EDITOR_FOUNDATION_SOURCES src/Foundation/UIEditorTheme.cpp ) +set(XCUI_EDITOR_APP_API_SOURCES + src/App/EditorHostCommandBridge.cpp + src/App/EditorSession.cpp +) + set(XCUI_EDITOR_FIELD_SOURCES src/Fields/UIEditorAssetField.cpp src/Fields/UIEditorAssetFieldInteraction.cpp @@ -136,6 +141,7 @@ set(XCUI_EDITOR_WIDGET_SUPPORT_SOURCES add_library(XCUIEditorLib STATIC ${XCUI_EDITOR_FOUNDATION_SOURCES} + ${XCUI_EDITOR_APP_API_SOURCES} ${XCUI_EDITOR_FIELD_SOURCES} ${XCUI_EDITOR_COLLECTION_SOURCES} ${XCUI_EDITOR_DOCKING_SOURCES} @@ -151,6 +157,7 @@ target_include_directories(XCUIEditorLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/engine/include + ${CMAKE_SOURCE_DIR}/engine/include/XCEngine PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ) @@ -161,7 +168,7 @@ target_compile_definitions(XCUIEditorLib PUBLIC xcui_editor_apply_common_target_settings(XCUIEditorLib PUBLIC) -target_link_libraries(XCUIEditorLib PUBLIC +target_link_libraries(XCUIEditorLib PRIVATE XCEngine ) @@ -241,11 +248,9 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) set(XCUI_EDITOR_APP_STATE_SOURCES app/State/EditorContext.cpp app/State/EditorContextStatus.cpp - app/State/EditorSession.cpp ) set(XCUI_EDITOR_APP_COMPOSITION_SOURCES - app/Composition/EditorHostCommandBridge.cpp app/Composition/EditorShellAssetBuilder.cpp app/Composition/EditorShellAssetCommands.cpp app/Composition/EditorShellAssetDefinition.cpp @@ -274,12 +279,9 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) set(XCUI_EDITOR_APP_RENDERING_SOURCES app/Rendering/Assets/BuiltInIcons.cpp - app/Rendering/Viewport/ViewportHostServiceFrame.cpp - app/Rendering/Viewport/ViewportHostServiceLifecycle.cpp + app/Rendering/Viewport/ViewportHostService.cpp + app/Rendering/Viewport/ViewportRenderTargets.cpp app/Rendering/Viewport/ViewportRenderTargetInternal.cpp - app/Rendering/Viewport/RenderTargetManager/Cleanup.cpp - app/Rendering/Viewport/RenderTargetManager/Resources.cpp - app/Rendering/Viewport/RenderTargetManager/Surfaces.cpp ) set(XCUI_EDITOR_APP_SUPPORT_SOURCES @@ -290,31 +292,16 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) app/Platform/Win32/EditorWindowBorderlessPlacement.cpp app/Platform/Win32/EditorWindowBorderlessResize.cpp app/Platform/Win32/EditorWindowFrame.cpp - app/Platform/Win32/EditorWindowFrameRuntime.cpp - app/Platform/Win32/EditorWindowTitleBarDragRestore.cpp + app/Platform/Win32/EditorWindowLifecycle.cpp + app/Platform/Win32/EditorWindowInput.cpp app/Platform/Win32/EditorWindowTitleBarInteraction.cpp app/Platform/Win32/EditorWindowTitleBarRendering.cpp - app/Platform/Win32/EditorWindowInitialization.cpp - app/Platform/Win32/EditorWindowPlatformInternal.cpp - app/Platform/Win32/EditorWindowRuntimeInternal.cpp - app/Platform/Win32/EditorWindowInputInternal.cpp - app/Platform/Win32/EditorWindowLifecycle.cpp - app/Platform/Win32/EditorWindowMetrics.cpp - app/Platform/Win32/EditorWindowInput.cpp - app/Platform/Win32/EditorWindowResizeLifecycle.cpp - app/Platform/Win32/WindowManager/Creation.cpp app/Platform/Win32/WindowManager/Lifecycle.cpp - app/Platform/Win32/WindowManager/Lookup.cpp - app/Platform/Win32/WindowManager/WindowSet.cpp app/Platform/Win32/WindowManager/WindowSync.cpp app/Platform/Win32/WindowManager/TabDrag.cpp - app/Platform/Win32/WindowManager/Detach.cpp - app/Platform/Win32/WindowManager/CrossWindowDrop.cpp - app/Platform/Win32/WindowManager/CrossWindowDropInternal.cpp ) - add_executable(XCUIEditorApp WIN32 - ${XCUI_EDITOR_APP_BOOTSTRAP_SOURCES} + set(XCUI_EDITOR_APP_LAYER_SOURCES ${XCUI_EDITOR_APP_STATE_SOURCES} ${XCUI_EDITOR_APP_COMPOSITION_SOURCES} ${XCUI_EDITOR_APP_FEATURE_SOURCES} @@ -323,6 +310,31 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) ${XCUI_EDITOR_APP_PLATFORM_SOURCES} ) + add_library(XCUIEditorAppLib STATIC + ${XCUI_EDITOR_APP_LAYER_SOURCES} + ) + + target_include_directories(XCUIEditorAppLib PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/app + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/engine/include + ) + + target_compile_definitions(XCUIEditorAppLib PRIVATE + XCUIEDITOR_REPO_ROOT="${XCUIEDITOR_REPO_ROOT_PATH}" + ) + + xcui_editor_apply_common_target_settings(XCUIEditorAppLib PRIVATE) + + target_link_libraries(XCUIEditorAppLib PRIVATE + XCUIEditorLib + XCUIEditorHost + ) + + add_executable(XCUIEditorApp WIN32 + ${XCUI_EDITOR_APP_BOOTSTRAP_SOURCES} + ) + target_include_directories(XCUIEditorApp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/app ) @@ -334,6 +346,7 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP) xcui_editor_apply_common_target_settings(XCUIEditorApp PRIVATE) target_link_libraries(XCUIEditorApp PRIVATE + XCUIEditorAppLib XCUIEditorLib XCUIEditorHost d2d1.lib diff --git a/tests/UI/Editor/integration/CMakeLists.txt b/tests/UI/Editor/integration/CMakeLists.txt index 908ef04c..3faf9398 100644 --- a/tests/UI/Editor/integration/CMakeLists.txt +++ b/tests/UI/Editor/integration/CMakeLists.txt @@ -1,5 +1,34 @@ file(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}" XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH) +function(xcengine_configure_editor_ui_integration_validation_target target) + set(options) + set(oneValueArgs OUTPUT_NAME) + cmake_parse_arguments(XCEDITOR_VALIDATION "${options}" "${oneValueArgs}" "" ${ARGN}) + + if(NOT TARGET ${target}) + message(FATAL_ERROR "Integration validation target '${target}' does not exist.") + endif() + + if(NOT XCEDITOR_VALIDATION_OUTPUT_NAME) + message(FATAL_ERROR "Integration validation target '${target}' requires OUTPUT_NAME.") + endif() + + target_link_libraries(${target} PRIVATE + XCUIEditorLib + editor_ui_integration_host + ) + + if(MSVC) + target_compile_options(${target} PRIVATE /utf-8 /FS) + set_property(TARGET ${target} PROPERTY + MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") + endif() + + set_target_properties(${target} PROPERTIES + OUTPUT_NAME "${XCEDITOR_VALIDATION_OUTPUT_NAME}" + ) +endfunction() + add_subdirectory(shared) add_subdirectory(shell) add_subdirectory(state) 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 d49658da..d35ea04d 100644 --- a/tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_asset_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_asset_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_asset_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_asset_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_asset_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_asset_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_asset_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_asset_field_basic_validation OUTPUT_NAME "XCUIEditorAssetFieldBasicValidation" -) +) \ No newline at end of file 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 6ba72574..31386175 100644 --- a/tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_bool_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_bool_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_bool_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_bool_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_bool_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_bool_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_bool_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_bool_field_basic_validation OUTPUT_NAME "XCUIEditorBoolFieldBasicValidation" -) +) \ No newline at end of file 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 3e43c8e1..5a64d440 100644 --- a/tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_color_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_color_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_color_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_color_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_color_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_color_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_color_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_color_field_basic_validation OUTPUT_NAME "XCUIEditorColorFieldBasicValidation" -) +) \ No newline at end of file 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 75e3d86a..b56abbbe 100644 --- a/tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_context_menu_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_context_menu_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_context_menu_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_context_menu_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_context_menu_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_context_menu_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_context_menu_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_context_menu_basic_validation OUTPUT_NAME "XCUIEditorContextMenuBasicValidation" -) +) \ No newline at end of file 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 d40ad7a2..76422100 100644 --- a/tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_dock_host_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_dock_host_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_dock_host_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_dock_host_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_dock_host_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_dock_host_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_dock_host_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_dock_host_basic_validation OUTPUT_NAME "XCUIEditorDockHostBasicValidation" -) +) \ No newline at end of file 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 c88696de..00a39b0a 100644 --- a/tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_editor_shell_compose_validation WIN32 main.cpp ) -target_include_directories(editor_ui_editor_shell_compose_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_editor_shell_compose_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_editor_shell_compose_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_editor_shell_compose_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_editor_shell_compose_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_editor_shell_compose_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_editor_shell_compose_validation OUTPUT_NAME "XCUIEditorShellComposeValidation" -) +) \ No newline at end of file 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 499ae1cf..1ba3a4be 100644 --- a/tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_editor_shell_interaction_validation WIN32 main.cpp ) -target_include_directories(editor_ui_editor_shell_interaction_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_editor_shell_interaction_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_editor_shell_interaction_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_editor_shell_interaction_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_editor_shell_interaction_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_editor_shell_interaction_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_editor_shell_interaction_validation OUTPUT_NAME "XCUIEditorShellInteractionValidation" -) +) \ No newline at end of file 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 c34b0025..f5801208 100644 --- a/tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp +++ b/tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp @@ -46,7 +46,7 @@ using XCEngine::UI::UIPoint; using XCEngine::UI::UIPointerButton; using XCEngine::UI::UIRect; using XCEngine::UI::Editor::AppendUIEditorShellInteraction; -using XCEngine::UI::Editor::BuildDefaultEditorShellAsset; +using XCEngine::UI::Editor::BuildEditorFoundationShellAsset; using XCEngine::UI::Editor::BuildDefaultUIEditorWorkspaceSession; using XCEngine::UI::Editor::BuildEditorShellShortcutManager; using XCEngine::UI::Editor::BuildDefaultUIEditorWorkspaceController; @@ -407,7 +407,7 @@ UIEditorMenuModel BuildMenuModel() { } EditorShellAsset BuildScenarioShellAsset() { - EditorShellAsset asset = BuildDefaultEditorShellAsset(ResolveRepoRootPath()); + EditorShellAsset asset = BuildEditorFoundationShellAsset(ResolveRepoRootPath()); asset.panelRegistry = BuildPanelRegistry(); asset.workspace = BuildWorkspace(); asset.workspaceSession = 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 465d3f1b..03f2f097 100644 --- a/tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_enum_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_enum_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_enum_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_enum_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_enum_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_enum_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_enum_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_enum_field_basic_validation OUTPUT_NAME "XCUIEditorEnumFieldBasicValidation" -) +) \ No newline at end of file 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 fd1bdef2..397f427b 100644 --- a/tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_list_view_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_list_view_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_list_view_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_list_view_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_list_view_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_list_view_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_list_view_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_list_view_basic_validation OUTPUT_NAME "XCUIEditorListViewBasicValidation" -) +) \ No newline at end of file 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 38e2bf03..6260151c 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 @@ -2,30 +2,7 @@ add_executable(editor_ui_list_view_inline_rename_validation WIN32 main.cpp ) -target_include_directories(editor_ui_list_view_inline_rename_validation PRIVATE - ${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 -) - -target_compile_definitions(editor_ui_list_view_inline_rename_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_list_view_inline_rename_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_list_view_inline_rename_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_list_view_inline_rename_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_list_view_inline_rename_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_list_view_inline_rename_validation OUTPUT_NAME "XCUIEditorListViewInlineRenameValidation" -) +) \ No newline at end of file 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 29866dbc..1be7f193 100644 --- a/tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_list_view_multiselect_validation WIN32 main.cpp ) -target_include_directories(editor_ui_list_view_multiselect_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_list_view_multiselect_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_list_view_multiselect_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_list_view_multiselect_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_list_view_multiselect_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_list_view_multiselect_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_list_view_multiselect_validation OUTPUT_NAME "XCUIEditorListViewMultiSelectValidation" -) +) \ No newline at end of file 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 f3e3890a..d0bf7310 100644 --- a/tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_menu_bar_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_menu_bar_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_menu_bar_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_menu_bar_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_menu_bar_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_menu_bar_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_menu_bar_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_menu_bar_basic_validation OUTPUT_NAME "XCUIEditorMenuBarBasicValidation" -) +) \ No newline at end of file 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 0e3fc0e7..d3ea1417 100644 --- a/tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_number_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_number_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_number_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_number_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_number_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_number_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_number_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_number_field_basic_validation OUTPUT_NAME "XCUIEditorNumberFieldBasicValidation" -) +) \ No newline at end of file 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 029acbd9..329c2f9d 100644 --- a/tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_object_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_object_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_object_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_object_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_object_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_object_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_object_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_object_field_basic_validation OUTPUT_NAME "XCUIEditorObjectFieldBasicValidation" -) +) \ No newline at end of file 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 c628d849..4e50bd09 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 @@ -2,29 +2,7 @@ add_executable(editor_ui_panel_content_host_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_panel_content_host_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_panel_content_host_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_panel_content_host_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_panel_content_host_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_panel_content_host_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_panel_content_host_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_panel_content_host_basic_validation OUTPUT_NAME "XCUIEditorPanelContentHostBasicValidation" -) +) \ No newline at end of file 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 d45caafe..17b3c1f8 100644 --- a/tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_panel_frame_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_panel_frame_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_panel_frame_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_panel_frame_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_panel_frame_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_panel_frame_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_panel_frame_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_panel_frame_basic_validation OUTPUT_NAME "XCUIEditorPanelFrameBasicValidation" -) +) \ No newline at end of file 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 f5352d16..db7badf1 100644 --- a/tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_property_grid_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_property_grid_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_property_grid_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_property_grid_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_property_grid_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_property_grid_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_property_grid_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_property_grid_basic_validation OUTPUT_NAME "XCUIEditorPropertyGridBasicValidation" -) +) \ No newline at end of file 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 c96b8c56..0570ff9d 100644 --- a/tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_scroll_view_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_scroll_view_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_scroll_view_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_scroll_view_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_scroll_view_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_scroll_view_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_scroll_view_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_scroll_view_basic_validation OUTPUT_NAME "XCUIEditorScrollViewBasicValidation" -) +) \ No newline at end of file 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 dd073be5..a02bb214 100644 --- a/tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_status_bar_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_status_bar_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_status_bar_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_status_bar_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_status_bar_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_status_bar_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_status_bar_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_status_bar_basic_validation OUTPUT_NAME "XCUIEditorStatusBarBasicValidation" -) +) \ No newline at end of file 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 b3696344..f3de1119 100644 --- a/tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_tab_strip_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_tab_strip_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_tab_strip_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_tab_strip_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_tab_strip_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_tab_strip_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_tab_strip_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_tab_strip_basic_validation OUTPUT_NAME "XCUIEditorTabStripBasicValidation" -) +) \ No newline at end of file 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 a34737a4..83f45f82 100644 --- a/tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_text_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_text_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_text_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_text_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_text_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_text_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_text_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_text_field_basic_validation OUTPUT_NAME "XCUIEditorTextFieldBasicValidation" -) +) \ No newline at end of file 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 c9f57083..a60f2026 100644 --- a/tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_tree_view_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_tree_view_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_tree_view_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_tree_view_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_tree_view_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_tree_view_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_tree_view_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_tree_view_basic_validation OUTPUT_NAME "XCUIEditorTreeViewBasicValidation" -) +) \ No newline at end of file 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 95e5166b..dc504428 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 @@ -2,30 +2,7 @@ add_executable(editor_ui_tree_view_inline_rename_validation WIN32 main.cpp ) -target_include_directories(editor_ui_tree_view_inline_rename_validation PRIVATE - ${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 -) - -target_compile_definitions(editor_ui_tree_view_inline_rename_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_tree_view_inline_rename_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_tree_view_inline_rename_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_tree_view_inline_rename_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_tree_view_inline_rename_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_tree_view_inline_rename_validation OUTPUT_NAME "XCUIEditorTreeViewInlineRenameValidation" -) +) \ No newline at end of file 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 caba7b94..84c38b00 100644 --- a/tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_tree_view_multiselect_validation WIN32 main.cpp ) -target_include_directories(editor_ui_tree_view_multiselect_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_tree_view_multiselect_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_tree_view_multiselect_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_tree_view_multiselect_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_tree_view_multiselect_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_tree_view_multiselect_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_tree_view_multiselect_validation OUTPUT_NAME "XCUIEditorTreeViewMultiSelectValidation" -) +) \ No newline at end of file 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 f5c0b631..51b32138 100644 --- a/tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_vector2_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_vector2_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_vector2_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_vector2_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_vector2_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_vector2_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_vector2_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_vector2_field_basic_validation OUTPUT_NAME "XCUIEditorVector2FieldBasicValidation" -) +) \ No newline at end of file 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 a2b0a1f8..b4567c64 100644 --- a/tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_vector3_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_vector3_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_vector3_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_vector3_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_vector3_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_vector3_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_vector3_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_vector3_field_basic_validation OUTPUT_NAME "XCUIEditorVector3FieldBasicValidation" -) +) \ No newline at end of file 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 69fe40ca..33461e21 100644 --- a/tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt @@ -2,30 +2,7 @@ add_executable(editor_ui_vector4_field_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_vector4_field_basic_validation PRIVATE - ${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_vector4_field_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_vector4_field_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_vector4_field_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_vector4_field_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_vector4_field_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_vector4_field_basic_validation OUTPUT_NAME "XCUIEditorVector4FieldBasicValidation" -) +) \ No newline at end of file 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 59a2851e..f128743a 100644 --- a/tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_viewport_shell_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_viewport_shell_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_viewport_shell_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_viewport_shell_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_viewport_shell_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_viewport_shell_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_viewport_shell_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_viewport_shell_basic_validation OUTPUT_NAME "XCUIEditorViewportShellBasicValidation" -) +) \ No newline at end of file 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 91bf2626..683512ef 100644 --- a/tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_viewport_slot_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_viewport_slot_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_viewport_slot_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_viewport_slot_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_viewport_slot_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_viewport_slot_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_viewport_slot_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_viewport_slot_basic_validation OUTPUT_NAME "XCUIEditorViewportSlotBasicValidation" -) +) \ No newline at end of file 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 3d2203a4..53a9334e 100644 --- a/tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_workspace_interaction_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_workspace_interaction_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_workspace_interaction_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_workspace_interaction_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_workspace_interaction_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_workspace_interaction_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_workspace_interaction_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_workspace_interaction_basic_validation OUTPUT_NAME "XCUIEditorWorkspaceInteractionBasicValidation" -) +) \ No newline at end of file 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 87fd0aec..691fe920 100644 --- a/tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_workspace_shell_compose_validation WIN32 main.cpp ) -target_include_directories(editor_ui_workspace_shell_compose_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_workspace_shell_compose_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_workspace_shell_compose_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_workspace_shell_compose_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_workspace_shell_compose_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_workspace_shell_compose_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_workspace_shell_compose_validation OUTPUT_NAME "XCUIEditorWorkspaceShellComposeValidation" -) +) \ No newline at end of file diff --git a/tests/UI/Editor/integration/shell/workspace_shell_compose/main.cpp b/tests/UI/Editor/integration/shell/workspace_shell_compose/main.cpp index 6c1d8193..155bf6ca 100644 --- a/tests/UI/Editor/integration/shell/workspace_shell_compose/main.cpp +++ b/tests/UI/Editor/integration/shell/workspace_shell_compose/main.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "Rendering/Native/AutoScreenshot.h" #include "Rendering/Native/NativeRenderer.h" 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 6ccb946c..1f851630 100644 --- a/tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt +++ b/tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_workspace_viewport_compose_validation WIN32 main.cpp ) -target_include_directories(editor_ui_workspace_viewport_compose_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_workspace_viewport_compose_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_workspace_viewport_compose_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_workspace_viewport_compose_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_workspace_viewport_compose_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_workspace_viewport_compose_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_workspace_viewport_compose_validation OUTPUT_NAME "XCUIEditorWorkspaceViewportComposeValidation" -) +) \ No newline at end of file diff --git a/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt b/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt index 61c151b5..ba22cb29 100644 --- a/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_layout_persistence_validation WIN32 main.cpp ) -target_include_directories(editor_ui_layout_persistence_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_layout_persistence_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_layout_persistence_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_layout_persistence_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_layout_persistence_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_layout_persistence_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_layout_persistence_validation OUTPUT_NAME "XCUIEditorLayoutPersistenceValidation" -) +) \ No newline at end of file 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 abe70663..5661c8ca 100644 --- a/tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_panel_host_lifecycle_validation WIN32 main.cpp ) -target_include_directories(editor_ui_panel_host_lifecycle_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_panel_host_lifecycle_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_panel_host_lifecycle_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_panel_host_lifecycle_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_panel_host_lifecycle_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_panel_host_lifecycle_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_panel_host_lifecycle_validation OUTPUT_NAME "XCUIEditorPanelHostLifecycleValidation" -) +) \ No newline at end of file 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 814109ab..2a7b162a 100644 --- a/tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_panel_session_flow_validation WIN32 main.cpp ) -target_include_directories(editor_ui_panel_session_flow_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_panel_session_flow_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_panel_session_flow_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_panel_session_flow_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_panel_session_flow_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_panel_session_flow_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_panel_session_flow_validation OUTPUT_NAME "XCUIEditorPanelSessionFlowValidation" -) +) \ No newline at end of file diff --git a/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt b/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt index a6822694..1cff39de 100644 --- a/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt +++ b/tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt @@ -2,29 +2,7 @@ add_executable(editor_ui_shortcut_dispatch_validation WIN32 main.cpp ) -target_include_directories(editor_ui_shortcut_dispatch_validation PRIVATE - ${CMAKE_SOURCE_DIR}/engine/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} -) - -target_compile_definitions(editor_ui_shortcut_dispatch_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_shortcut_dispatch_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_shortcut_dispatch_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_shortcut_dispatch_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_shortcut_dispatch_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_shortcut_dispatch_validation OUTPUT_NAME "XCUIEditorShortcutDispatchValidation" -) +) \ No newline at end of file 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 eb37a9d4..bfe9b534 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 @@ -2,29 +2,7 @@ add_executable(editor_ui_viewport_input_bridge_basic_validation WIN32 main.cpp ) -target_include_directories(editor_ui_viewport_input_bridge_basic_validation PRIVATE - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include - ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT} - ${CMAKE_SOURCE_DIR}/engine/include -) - -target_compile_definitions(editor_ui_viewport_input_bridge_basic_validation PRIVATE - UNICODE - _UNICODE - XCENGINE_EDITOR_UI_TESTS_REPO_ROOT="${XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH}" -) - -if(MSVC) - target_compile_options(editor_ui_viewport_input_bridge_basic_validation PRIVATE /utf-8 /FS) - set_property(TARGET editor_ui_viewport_input_bridge_basic_validation PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") -endif() - -target_link_libraries(editor_ui_viewport_input_bridge_basic_validation PRIVATE - XCUIEditorLib - XCUIEditorHost -) - -set_target_properties(editor_ui_viewport_input_bridge_basic_validation PROPERTIES +xcengine_configure_editor_ui_integration_validation_target( + editor_ui_viewport_input_bridge_basic_validation OUTPUT_NAME "XCUIEditorViewportInputBridgeBasicValidation" -) +) \ No newline at end of file