From 9c746da4ae92ccc750bd8b4c858aa3f1d0cdf36d Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Thu, 25 Mar 2021 00:38:19 +0300
Subject: update cmake-common

---
 .appveyor.yml       | 9 ++++-----
 .appveyor/build.ps1 | 3 +++
 .appveyor/test.ps1  | 2 ++
 um/cmake            | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 22df3dd..7c05026 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,6 @@ image: Visual Studio 2013
 environment:
   global:
     python_exe: C:\Python36-x64\python.exe
-    install_dir: C:\Projects\install\win7drv
   matrix:
     - appveyor_driver_target_os: Win7
     - appveyor_driver_target_os: Win8
@@ -38,12 +37,12 @@ install:
 
 build_script:
   - cd um\cmake
-  - '"%python_exe%" -m project.ci.appveyor.cmake --install "%install_dir%"'
+  - '"%python_exe%" -m project.ci.cmake --install'
   - cd ..\..
-  - ps: .\.appveyor\build.ps1 -InstallDir $env:install_dir
+  - ps: .\.appveyor\build.ps1 -InstallDir ..\build\install
 
 after_build:
-  - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%-%appveyor_driver_target_os%.zip" "%install_dir%"
+  - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%-%appveyor_driver_target_os%.zip" "..\build\install\*"
   - appveyor.exe PushArtifact "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%-%appveyor_driver_target_os%.zip"
 
 for:
@@ -68,4 +67,4 @@ for:
     - ps: Start-Sleep -s 10
     - appveyor.exe AddMessage "OK"
   test_script:
-    - ps: .\.appveyor\test.ps1 -InstallDir $env:install_dir
+    - ps: .\.appveyor\test.ps1 -InstallDir ..\build\install
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1
index 432bca3..18e7cc6 100644
--- a/.appveyor/build.ps1
+++ b/.appveyor/build.ps1
@@ -134,6 +134,9 @@ function Build-ProjectAppVeyor {
         $appveyor_cwd = pwd
     }
 
+    $script:ProjectDir = (Resolve-Path $script:ProjectDir).Path
+    $script:InstallDir = (Resolve-Path $script:InstallDir).Path
+
     try {
         Build-ProjectKernelMode                  `
             -ProjectDir $script:ProjectDir       `
diff --git a/.appveyor/test.ps1 b/.appveyor/test.ps1
index c17e99e..8c28bf9 100644
--- a/.appveyor/test.ps1
+++ b/.appveyor/test.ps1
@@ -108,6 +108,8 @@ function Run-ProjectTestsAppVeyor {
         $appveyor_cwd = pwd
     }
 
+    $script:InstallDir = (Resolve-Path $script:InstallDir).Path
+
     try {
         Run-ProjectTests -InstallDir $script:InstallDir
     } finally {
diff --git a/um/cmake b/um/cmake
index 62a426a..f1d8aaf 160000
--- a/um/cmake
+++ b/um/cmake
@@ -1 +1 @@
-Subproject commit 62a426a08b7d16e58f0c906ed382aceb9bcb9aa2
+Subproject commit f1d8aaf9bd9c8f6e8a0907422a34c023d527f13f
-- 
cgit v1.2.3