Skip to content

Commit

Permalink
Remove vcpkg
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuki-cpp committed Dec 23, 2023
1 parent 9a2d6c6 commit c491900
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 20 deletions.
3 changes: 1 addition & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ AllowAllParametersOfDeclarationOnNextLine: false
AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BreakBeforeBinaryOperators: false
Expand Down Expand Up @@ -91,4 +90,4 @@ AlignEscapedNewlinesLeft: false
AlignTrailingComments: true
AlignAfterOpenBracket: Align
DerivePointerBinding: false
FixNamespaceComments: true
FixNamespaceComments: true
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Generate compilation database
run: |
mkdir build
cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
cmake -S . -B build
- name: Run sonar-scanner
env:
Expand All @@ -75,7 +75,7 @@ jobs:
- name: Build
run: |
mkdir build
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON
cmake --build build/
./build/typelist_utils
llvm-profdata-17 merge -sparse ./default.profraw -o ./default.profdata
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Build
run: |
mkdir build
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON
cmake --build build/
- name: Perform CodeQL Analysis
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ set(
ON
)

find_package(Catch2 REQUIRED)
include(FetchContent)

FetchContent_Declare(Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_TAG v3.4.0)
FetchContent_MakeAvailable(Catch2)

add_executable(typelist_utils test/main.cpp test/test_utils.cpp test/test_sort.cpp)
target_include_directories(typelist_utils PRIVATE include)
Expand Down
4 changes: 1 addition & 3 deletions test/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#define CATCH_CONFIG_MAIN


#include <catch.hpp>
#include <catch2/reporters/catch_reporter_sonarqube.hpp>
#include <catch2/reporters/catch_reporter_sonarqube.hpp>
4 changes: 2 additions & 2 deletions test/test_sort.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <tuple>

#include <catch.hpp>
#include <catch2/catch_test_macros.hpp>
#include <typelist_utils/tl.hpp>

using a = std::integral_constant<int, 0>;
Expand Down Expand Up @@ -106,4 +106,4 @@ TEST_CASE("tl::sort works", "[tl::sort]")
REQUIRE(std::is_same_v<sorted_greater, descending>);
REQUIRE(std::is_same_v<sorted_lesser, ascending>);
}
}
}
4 changes: 2 additions & 2 deletions test/test_utils.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <tuple>

#include <catch.hpp>
#include <catch2/catch_test_macros.hpp>
#include <typelist_utils/tl.hpp>

TEST_CASE("tl::start_with works", "[tl::start_with]")
Expand Down Expand Up @@ -202,4 +202,4 @@ TEST_CASE("tl::swap_elements works", "[tl::swap_elements]")
REQUIRE(std::is_same_v<tl::swap_elements_t<t, 0, 2>, swap_0_2>);
REQUIRE(std::is_same_v<tl::swap_elements_t<t, 1, 2>, swap_1_2>);
}
}
}
7 changes: 0 additions & 7 deletions vcpkg.json

This file was deleted.

0 comments on commit c491900

Please sign in to comment.