Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump FixFormat.cmake to Version 1.1.0 #124

Merged
merged 3 commits into from
Jan 19, 2024
Merged

Bump FixFormat.cmake to Version 1.1.0 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
750454f
chore: bump FixFormat.cmake to version 1.1.0
threeal Jan 19, 2024
0426bb7
build: utilize `add_fix_format` function, replacing `target_fix_format`
threeal Jan 19, 2024
86029db
ci(build): call the correct format target in `check-project` job
threeal Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Check Format
run: |
cmake --build build --target format
cmake --build build --target format-all
git diff --exit-code HEAD

test-project:
Expand Down
11 changes: 3 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
include(CheckWarning)
add_check_warning()

find_package(FixFormat REQUIRED)
include(FixFormat)
target_fix_format(sequence)
target_fix_format(generate_sequence)

find_package(Catch2 REQUIRED)

get_target_property(sequence_SOURCES sequence SOURCES)
Expand All @@ -48,13 +43,13 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)

include(CheckCoverage)
target_check_coverage(sequence_test)
target_fix_format(sequence_test)

include(Catch)
catch_discover_tests(sequence_test)

add_custom_target(format)
add_dependencies(format sequence_format generate_sequence_format sequence_test_format)
find_package(FixFormat REQUIRED)
include(FixFormat)
add_fix_format()
endif()

install(
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindFixFormat.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ if(FixFormat_FOUND)
endif()

include(CPM)
cpmaddpackage(gh:threeal/FixFormat.cmake@1.0.0)
cpmaddpackage(gh:threeal/FixFormat.cmake@1.1.0)

list(APPEND CMAKE_MODULE_PATH ${FixFormat_SOURCE_DIR}/cmake)