From f5fcbfb26756a75e8d1d0741b78f501b2253b688 Mon Sep 17 00:00:00 2001 From: Joscha Schmiedt <joscha@schmiedt.dev> Date: Wed, 14 Aug 2024 09:09:39 +0200 Subject: [PATCH] Fix vcpkg Makefile targets --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3467cba..b552fa9 100644 --- a/Makefile +++ b/Makefile @@ -98,14 +98,15 @@ conan-build-debug: vcpkg-install: - ./vcpkg/bootstrap-vcpkg.sh - vcpkg/vcpkg install + ./vcpkg/bootstrap-vcpkg.sh\ + &&vcpkg/vcpkg install vcpkg-build-release: vcpkg-install - mkdir -p build/build_tools\ - && cp vcpkg_installed/x64-linux/tools/grpc/grpc_cpp_plugin build/build_tools - cmake -S .. -B . -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux -DCMAKE_BUILD_TYPE=Release - cmake --build . + mkdir -p build/build_tools\ + && cp vcpkg_installed/x64-linux/tools/grpc/grpc_cpp_plugin build/build_tools\ + && cd build\ + && cmake -S .. -B . -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux -DCMAKE_BUILD_TYPE=Release\ + && cmake --build . ctest: cd build/Debug && ctest -- GitLab