Fixed build scripts, updated ComputeEngine submodule

This commit is contained in:
Dawid Pietrykowski 2023-06-05 19:28:40 +02:00
parent 5c928b82c9
commit b7a01a4e54
4 changed files with 16 additions and 6 deletions

@ -1 +1 @@
Subproject commit d84a7a93da7c7b6c60ed044f25add70b1cd13352 Subproject commit b7a9ac3e937b8946ec581cdf980dbb29f9056b76

View File

@ -1 +1,4 @@
rm -rf cmake-build-debug try return 0 ; rm -fr build try return 0 ; cmake -B build -S . ; cmake --build build --config Release rm -rf cmake-build-debug try return 0
rm -fr build try return 0
cmake -B build -S .
cmake --build build --config Release

View File

@ -1,9 +1,9 @@
@echo off @echo off
set ComputeEngine_ROOT=%CD%/ComputeEngine set ComputeEngine_ROOT=%CD%/ComputeEngine
set vcpkg_ROOT=C:\Desktop\git\vcpkg\scripts\buildsystems\vcpkg.cmake set vcpkg_ROOT=%1
cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% -DVCPKG_TARGET_TRIPLET=x64-windows-static cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT%
cmake --build ComputeEngine/build --config Release cmake --build ComputeEngine/build --config Release
cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% -DVCPKG_TARGET_TRIPLET=x64-windows-static cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT%
cmake --build build --config Release cmake --build build --config Release

7
make_all.sh Executable file
View File

@ -0,0 +1,7 @@
ComputeEngine_ROOT=$(dirname $0)/ComputeEngine
vcpkg_ROOT=$1
cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=$vcpkg_ROOT
cmake --build ComputeEngine/build --config Release
cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$vcpkg_ROOT
cmake --build build --config Release