From fe76cd67d0394d34c79cf0031f3aec4fcd4ce5d2 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Mon, 1 Jan 2024 22:54:58 -0600
Subject: [PATCH] Flexibility updates for Windows setup

---
 setup-debug.bat        | 13 ++++++++++---
 setup-release.bat      | 13 ++++++++++---
 tools/setup-common.bat |  6 +++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/setup-debug.bat b/setup-debug.bat
index 505a0b81..ec5675df 100644
--- a/setup-debug.bat
+++ b/setup-debug.bat
@@ -1,5 +1,12 @@
 call tools\setup-common.bat
-mkdir build-debug
-cd build-debug
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.6.1/msvc2019_64 ..
+
+set build_dir=build-debug
+set build_type=Debug
+set qt_version=6.6.1
+
+mkdir %build_dir%
+cmake -B %build_dir% -S . ^
+    -DCMAKE_BUILD_TYPE=%build_type% ^
+    -DCMAKE_CONFIGURATION_TYPES=%build_type% ^
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64
 pause
diff --git a/setup-release.bat b/setup-release.bat
index 31e19d92..7141c29b 100644
--- a/setup-release.bat
+++ b/setup-release.bat
@@ -1,5 +1,12 @@
 call tools\setup-common.bat
-mkdir build-release
-cd build-release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.6.1/msvc2019_64 ..
+
+set build_dir=build-release
+set build_type=Release
+set qt_version=6.6.1
+
+mkdir %build_dir%
+cmake -B %build_dir% -S . ^
+    -DCMAKE_BUILD_TYPE=%build_type% ^
+    -DCMAKE_CONFIGURATION_TYPES=%build_type% ^
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64
 pause
diff --git a/tools/setup-common.bat b/tools/setup-common.bat
index f934f2c8..8362be70 100644
--- a/tools/setup-common.bat
+++ b/tools/setup-common.bat
@@ -1,4 +1,4 @@
-pip install "conan<2.0"
-pip install geopandas
-pip install GitPython
+pip install --upgrade "conan<2.0"
+pip install --upgrade geopandas
+pip install --upgrade GitPython
 conan profile new default --detect