From 6667f46c536d5b6bde397aec942120937af2344e Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 25 May 2025 14:56:26 -0500 Subject: [PATCH] Setup scripts should be runnable from any directory --- tools/lib/setup-common.bat | 10 +++++----- tools/setup-debug-msvc2022.bat | 2 +- tools/setup-debug-ninja.bat | 2 +- tools/setup-multi-msvc2022.bat | 2 +- tools/setup-multi-ninja.bat | 2 +- tools/setup-release-msvc2022.bat | 2 +- tools/setup-release-ninja.bat | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/lib/setup-common.bat b/tools/lib/setup-common.bat index d04cf430..9ad81104 100644 --- a/tools/lib/setup-common.bat +++ b/tools/lib/setup-common.bat @@ -1,26 +1,26 @@ @set script_dir=%~dp0 :: Import common paths -@call lib\common-paths.bat +@call %script_dir%\common-paths.bat :: Install Python packages pip install --upgrade -r "%script_dir%\..\..\requirements.txt" @if defined build_type ( :: Install Conan profile and packages - call lib\setup-conan.bat + call %script_dir%\setup-conan.bat ) else ( :: Install Conan profile and debug packages set build_type=Debug - call lib\setup-conan.bat + call %script_dir%\setup-conan.bat :: Install Conan profile and release packages set build_type=Release - call lib\setup-conan.bat + call %script_dir%\setup-conan.bat :: Unset build_type set build_type= ) :: Run CMake Configure -@call lib\run-cmake-configure.bat +@call %script_dir%\run-cmake-configure.bat diff --git a/tools/setup-debug-msvc2022.bat b/tools/setup-debug-msvc2022.bat index 4e775e3f..1aba72b1 100644 --- a/tools/setup-debug-msvc2022.bat +++ b/tools/setup-debug-msvc2022.bat @@ -11,6 +11,6 @@ @if not "%~1"=="" set build_dir=%~1 :: Perform common setup -@call lib\setup-common.bat +@call %script_dir%\lib\setup-common.bat @pause diff --git a/tools/setup-debug-ninja.bat b/tools/setup-debug-ninja.bat index fb360f25..4e488bd2 100644 --- a/tools/setup-debug-ninja.bat +++ b/tools/setup-debug-ninja.bat @@ -11,6 +11,6 @@ @if not "%~1"=="" set build_dir=%~1 :: Perform common setup -@call lib\setup-common.bat +@call %script_dir%\lib\setup-common.bat @pause diff --git a/tools/setup-multi-msvc2022.bat b/tools/setup-multi-msvc2022.bat index 07d6c567..ea54091f 100644 --- a/tools/setup-multi-msvc2022.bat +++ b/tools/setup-multi-msvc2022.bat @@ -10,6 +10,6 @@ @if not "%~1"=="" set build_dir=%~1 :: Perform common setup -@call lib\setup-common.bat +@call %script_dir%\lib\setup-common.bat @pause diff --git a/tools/setup-multi-ninja.bat b/tools/setup-multi-ninja.bat index 11327488..e7a424ca 100644 --- a/tools/setup-multi-ninja.bat +++ b/tools/setup-multi-ninja.bat @@ -10,6 +10,6 @@ @if not "%~1"=="" set build_dir=%~1 :: Perform common setup -@call lib\setup-common.bat +@call %script_dir%\lib\setup-common.bat @pause diff --git a/tools/setup-release-msvc2022.bat b/tools/setup-release-msvc2022.bat index d1f57aca..3a988f56 100644 --- a/tools/setup-release-msvc2022.bat +++ b/tools/setup-release-msvc2022.bat @@ -11,6 +11,6 @@ @if not "%~1"=="" set build_dir=%~1 :: Perform common setup -@call lib\setup-common.bat +@call %script_dir%\lib\setup-common.bat @pause diff --git a/tools/setup-release-ninja.bat b/tools/setup-release-ninja.bat index d452f408..667721d5 100644 --- a/tools/setup-release-ninja.bat +++ b/tools/setup-release-ninja.bat @@ -11,6 +11,6 @@ @if not "%~1"=="" set build_dir=%~1 :: Perform common setup -@call lib\setup-common.bat +@call %script_dir%\lib\setup-common.bat @pause