CMake fixes in single-root-UI test

microsoft · Nov 4, 2024 · 6d04a62 · 6d04a62
1 parent 26e0d22
commit 6d04a62
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",