From c995551a3ea6c6e9454d60ba16c31ed1469cb498 Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Tue, 5 Sep 2023 18:23:02 +0200
Subject: [PATCH] Added error check and script uniformization
---
setup.ps1 | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/setup.ps1 b/setup.ps1
index 8a70b586..595ff3e2 100644
--- a/setup.ps1
+++ b/setup.ps1
@@ -4,20 +4,35 @@
################################################################################
# aidge_core must be installed first in $env:AIDGE_INSTALL_PATH.
+# Enable or disable automatic installation of requirements
+# Run .\setup.ps1 -install_reqs:$false to disable it
+param ([bool]$install_reqs=$true)
+
if (-not $env:AIDGE_INSTALL_PATH)
{
Write-Error -Message "AIDGE_INSTALL_PATH environment variable must be set to aidge_core install path." -ErrorAction Stop
}
-# Compile & install aidge_core
+# 1. Setup environment
################################################################################
+if ($install_reqs)
+{
+ # No additional dependencies
+}
+# 2. Compile & install aidge_core
+################################################################################
$env:CMAKE_PREFIX_PATH=$env:AIDGE_INSTALL_PATH
-md -Force build_cpp
-md -Force $env:AIDGE_INSTALL_PATH
-cd build_cpp
+mkdir -Force build_cpp
+mkdir -Force $env:AIDGE_INSTALL_PATH
+Set-Location build_cpp
cmake -DCMAKE_INSTALL_PREFIX:PATH=$env:AIDGE_INSTALL_PATH -DCMAKE_BUILD_TYPE=Debug ..
+if(!$?) { Set-Location $PSScriptRoot; Exit $LASTEXITCODE }
cmake --build . -j2
+if(!$?) { Set-Location $PSScriptRoot; Exit $LASTEXITCODE }
cmake --install . --config Debug
+if(!$?) { Set-Location $PSScriptRoot; Exit $LASTEXITCODE }
# Optional: run the unit tests
ctest --output-on-failure
+if(!$?) { Set-Location $PSScriptRoot; Exit $LASTEXITCODE }
+Set-Location $PSScriptRoot
--
GitLab