Allow portable builds

2019-03-29 18:12:43 +01:00 · 2019-03-29 18:12:43 +01:00 · db9c7c41dc
parent f1b4f34600
commit db9c7c41dc
3 changed files with 11 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 328eef4673a541f7727fcbdf51fd9e52dda16058
+Subproject commit d680d3dd53c36a861a4428ee181d807c94f85081
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9a8e5be8ee312aaf7b38afaa9745a9d07ac91266
+Subproject commit 38f664fcf6eef57d5ef0cce9a82b8eb9a52339b4
--- a/build.ps1
+++ b/build.ps1
@ -86,8 +86,16 @@ try {
    if (Test-Path "CMakeCache.txt") {
        Remove-Item "CMakeCache.txt" # Perform a clean build
    }
+    if($installer) {
+        $portable = "OFF"
+    }
+    else {
+        $portable = "ON"
+    }

-    cmake ../.. -G"$cmake_generator" `
+    cmake `
+        -DBUILD_PORTABLE="$portable" `
+        ../.. -G"$cmake_generator" `
        -DVCPKG_TARGET_TRIPLET="$triplet" `
        -DVCPKG_APPLOCAL_DEPS=ON `
        -DCMAKE_TOOLCHAIN_FILE="$vcpkg_root/scripts/buildsystems/vcpkg.cmake" `