diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ae5d9e..f20134c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,8 +30,9 @@ jobs: with: submodules: true - uses: seanmiddleditch/gha-setup-ninja@v6 - - uses: pre-commit/action@v3.0.1 - env: - pythonLocation: ${{ matrix.os }} - - run: cmake -B build -DBUILD_SHARED_LIBS=${{ matrix.shared }} + - uses: lukka/run-vcpkg@v11 +# - uses: pre-commit/action@v3.0.1 +# env: +# pythonLocation: ${{ matrix.os }} + - run: cmake -B build -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DCMAKE_TOOLCHAIN_FILE="${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" - run: cmake --build build --verbose diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fe07c99..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vcpkg"] - path = vcpkg - url = https://github.com/microsoft/vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index b9b57fd..89bbf36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(CMAKE_TOOLCHAIN_FILE - "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "Vcpkg toolchain file") - option(BUILD_SHARED_LIBS "build library as shared" OFF) project(ctactless) diff --git a/vcpkg b/vcpkg deleted file mode 160000 index 0ca64b4..0000000 --- a/vcpkg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ca64b4e1c70fa6d9f53b369b8f3f0843797c20c