From d870599a60087328f56b8433f90d475485476e12 Mon Sep 17 00:00:00 2001 From: Karutoh Date: Sun, 29 Sep 2024 21:06:30 -0700 Subject: [PATCH] Added vcpkg. --- .gitea/workflows/BuildRelease.yaml | 1 + CMakeLists.txt | 5 ----- vcpkg.json | 8 ++++++++ 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 vcpkg.json diff --git a/.gitea/workflows/BuildRelease.yaml b/.gitea/workflows/BuildRelease.yaml index 3f807f7..fc8e013 100644 --- a/.gitea/workflows/BuildRelease.yaml +++ b/.gitea/workflows/BuildRelease.yaml @@ -19,6 +19,7 @@ jobs: - name: Building/Compiling/Installing Project run: | cd ${{ gitea.workspace }} + vcpkg install cmake -A x64 -DCMAKE_BUILD_TYPE=Release . cd build cmake --build . --config Release diff --git a/CMakeLists.txt b/CMakeLists.txt index 802bb74..93ea536 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,11 +259,6 @@ if (IS_OS_LINUX) target_include_directories(EHS_Stc PRIVATE ${PIPEWIRE_INCLUDE_DIRS}) target_include_directories(EHS_Dyn PRIVATE ${PIPEWIRE_INCLUDE_DIRS}) elseif (IS_OS_WINDOWS) - if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "Vcpkg toolchain file") - endif() - set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS") install(TARGETS EHS_Dyn LIBRARY DESTINATION "lib") install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin") diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..eb3d94a --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "EHS", + "version": "1.0", + "dependencies": [ + "zlib", + "openssl" + ] +} \ No newline at end of file