summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitya Selivanov <0x7fffff@guattari.ru>2022-08-21 15:32:54 +0400
committerMitya Selivanov <0x7fffff@guattari.ru>2022-08-21 15:32:54 +0400
commit17bb451f1795e05e95d674f9308fb0d7d15559d6 (patch)
tree1f09e1fb3ec78820e8249b38a9667f146112ae83
parentbe66e8b9525bc37bc913d2abf0e8a1f3fdedf645 (diff)
downloadkit-17bb451f1795e05e95d674f9308fb0d7d15559d6.zip
[CI] Cleanup dependencies
-rw-r--r--.github/workflows/build_and_test.yml15
-rw-r--r--CMakeLists.txt3
-rw-r--r--source/test/programs/CMakeLists.txt6
3 files changed, 7 insertions, 17 deletions
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 6f29517..88cbccb 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -23,16 +23,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up CMake 3.18
- uses: jwlawson/actions-setup-cmake@v1.8
- with:
- cmake-version: 3.18
-
- - name: Install gcovr
- if: runner.os != 'Windows'
- run: |
- python3 -m pip install gcovr==5.0
-
- name: Install OpenCppCoverage
if: runner.os == 'Windows'
shell: bash
@@ -93,11 +83,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up CMake 3.18
- uses: jwlawson/actions-setup-cmake@v1.8
- with:
- cmake-version: 3.18
-
- name: Build
if: runner.os != 'Windows'
run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ca6ce3..23cc9bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ project(
${KIT_PROJECT}
VERSION 0.1.1
DESCRIPTION "A collection of C libraries"
- LANGUAGES C CXX)
+ LANGUAGES C)
add_library(${KIT_LIBRARY} STATIC)
add_library(${KIT_PROJECT}::${KIT_LIBRARY} ALIAS ${KIT_LIBRARY})
@@ -120,7 +120,6 @@ target_include_directories(
${KIT_TEST_LIBRARY} INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source>)
target_compile_features(${KIT_TEST_LIBRARY} PUBLIC c_std_11)
-target_compile_features(${KIT_TEST_LIBRARY} PUBLIC cxx_std_11)
enable_testing()
diff --git a/source/test/programs/CMakeLists.txt b/source/test/programs/CMakeLists.txt
index 5baf56a..bdaf89e 100644
--- a/source/test/programs/CMakeLists.txt
+++ b/source/test/programs/CMakeLists.txt
@@ -1,3 +1,9 @@
+project(
+ ${KIT_PROJECT}_test_programs
+ VERSION 0.1.1
+ DESCRIPTION "Kit test programs"
+ LANGUAGES C CXX)
+
if(KIT_ENABLE_TESTING)
add_executable(too_many_tests too_many_tests.c)
target_link_libraries(too_many_tests ${KIT_TEST_LIBRARY})