From 6d04a6219ab4f84fc47c58c616ef5761366783db Mon Sep 17 00:00:00 2001
From: Tofik Sonono <tofik.sonono@intel.com>
Date: Thu, 31 Oct 2024 13:40:13 +0100
Subject: [PATCH] CMake fixes in single-root-UI test

---
 .../single-root-UI/project-folder/CMakeLists.txt            | 2 +-
 .../single-root-UI/project-folder/CMakePresets.json         | 4 ++--
 .../single-root-UI/project-folder/CMakeUserPresets.json     | 6 +++---
 .../project-folder/include/IncludedPresets1.json            | 2 +-
 .../project-folder/include/IncludedPresets2.json            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/end-to-end-tests/single-root-UI/project-folder/CMakeLists.txt b/test/end-to-end-tests/single-root-UI/project-folder/CMakeLists.txt
index dff0b8e57..0c51956ce 100644
--- a/test/end-to-end-tests/single-root-UI/project-folder/CMakeLists.txt
+++ b/test/end-to-end-tests/single-root-UI/project-folder/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(TestBuildProcess VERSION 0.1.0)
 
 set(CMT_COOKIE passed-cookie CACHE STRING "Cookie to be written by the main executable")
diff --git a/test/end-to-end-tests/single-root-UI/project-folder/CMakePresets.json b/test/end-to-end-tests/single-root-UI/project-folder/CMakePresets.json
index e78e95aae..f049729a3 100644
--- a/test/end-to-end-tests/single-root-UI/project-folder/CMakePresets.json
+++ b/test/end-to-end-tests/single-root-UI/project-folder/CMakePresets.json
@@ -5,12 +5,12 @@
       "name": "Linux1",
       "description": "Sets generator, build and install directory, vcpkg",
       "generator": "Ninja",
-      "binaryDir": "${workspaceFolder}/build",
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_TOOLCHAIN_FILE": {
             "type": "FILEPATH",
-            "value": "${workspaceFolder}/test-toolchain.cmake"
+            "value": "${sourceDir}/test-toolchain.cmake"
         }
       }
     }
diff --git a/test/end-to-end-tests/single-root-UI/project-folder/CMakeUserPresets.json b/test/end-to-end-tests/single-root-UI/project-folder/CMakeUserPresets.json
index e85796119..6fe319e92 100644
--- a/test/end-to-end-tests/single-root-UI/project-folder/CMakeUserPresets.json
+++ b/test/end-to-end-tests/single-root-UI/project-folder/CMakeUserPresets.json
@@ -8,7 +8,7 @@
       "name": "LinuxUser1",
       "description": "Sets generator, build and install directory, vcpkg",
       "generator": "Unix Makefiles",
-      "binaryDir": "${workspaceFolder}/build",
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "gcc",
@@ -22,7 +22,7 @@
       "name": "WindowsUser1",
       "description": "Sets generator, build and install directory, vcpkg",
       "generator": "Visual Studio 16 2019",
-      "binaryDir": "${workspaceFolder}/build",
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "cl.exe",
@@ -35,7 +35,7 @@
     {
       "name": "NoGenerator",
       "description": "Skips setting a generator",
-      "binaryDir": "${workspaceFolder}/build",
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "gcc",
diff --git a/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets1.json b/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets1.json
index e0dfc3f3d..f0b3b74ca 100644
--- a/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets1.json
+++ b/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets1.json
@@ -8,7 +8,7 @@
       "name": "LinuxIncluded1",
       "description": "Sets generator, build and install directory, vcpkg",
       "generator": "Unix Makefiles",
-      "binaryDir": "${workspaceFolder}/build",
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "gcc",
diff --git a/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets2.json b/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets2.json
index 8faab3d3b..fc3ef1704 100644
--- a/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets2.json
+++ b/test/end-to-end-tests/single-root-UI/project-folder/include/IncludedPresets2.json
@@ -5,7 +5,7 @@
       "name": "LinuxIncluded2",
       "description": "Sets generator, build and install directory, vcpkg",
       "generator": "Unix Makefiles",
-      "binaryDir": "${workspaceFolder}/build",
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "gcc",