From df1514a657b18bffdc453b175256e79e4c79106d Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 5 Dec 2023 13:49:20 +0100 Subject: [PATCH] set toolchain file --- .github/workflows/build-debian-11.yml | 2 +- deps/CMakeLists.txt | 5 +---- scripts/debian/2-configure.sh | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian-11.yml b/.github/workflows/build-debian-11.yml index 337b387..c9a633b 100644 --- a/.github/workflows/build-debian-11.yml +++ b/.github/workflows/build-debian-11.yml @@ -28,7 +28,7 @@ jobs: uses: lukka/run-vcpkg@v11 - name: Create Build Environment - run: bash ./scripts/debian/2-configure.sh + run: bash ./scripts/debian/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake' - name: Build Server run: bash ./scripts/debian/3-build.sh diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index f439b19..d2e97f8 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1,6 +1,3 @@ include_directories("${PROJECT_SOURCE_DIR}/deps") -add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline") -add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt") -add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2") -add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest") +add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline") \ No newline at end of file diff --git a/scripts/debian/2-configure.sh b/scripts/debian/2-configure.sh index bce5e9e..0c3edc1 100755 --- a/scripts/debian/2-configure.sh +++ b/scripts/debian/2-configure.sh @@ -2,4 +2,4 @@ set -ex -cmake ${1:-.} -B bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON || cat "$SOURCE"/server/bin/vcpkg-bootstrap.log +cmake . -B bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON || cat "$SOURCE"/server/bin/vcpkg-bootstrap.log $1