Skip to content

Commit 6301f48

Browse files
authored
Merge pull request #21 from ZIMO-Elektronik/add_clang_format_target
fix: add_clang_format_target doesn't fail without clang-format
2 parents abbbf1e + 612a147 commit 6301f48

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 0.9.3
4+
- Update to CPM 0.40.2
5+
- Bugfix `add_clang_format_target` doesn't fail without `clang-format`
6+
37
## 0.9.2
48
- Update to CPM 0.40.1
59

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(NOT cpm.cmake_SOURCE_DIR)
1515
FetchContent_Declare(
1616
CPM.cmake
1717
GIT_REPOSITORY "https://github.com/cpm-cmake/CPM.cmake.git"
18-
GIT_TAG v0.40.1)
18+
GIT_TAG v0.40.2)
1919
FetchContent_MakeAvailable(CPM.cmake)
2020
include(${cpm.cmake_SOURCE_DIR}/cmake/CPM.cmake)
2121
endif()

cmake/add_clang_format_target.cmake

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ function(add_clang_format_target TARGET)
2626
set(MULTI_VALUE_KEYWORDS OPTIONS FILES)
2727
cmake_parse_arguments(ARG "" "" "${MULTI_VALUE_KEYWORDS}" "${ARGN}")
2828

29-
find_program(CLANG_FORMAT_EXECUTABLE clang-format REQUIRED)
29+
find_program(CLANG_FORMAT_EXECUTABLE clang-format)
3030

31-
add_custom_target(
32-
${TARGET}
33-
COMMAND ${CLANG_FORMAT_EXECUTABLE} ${ARG_OPTIONS} ${ARG_FILES}
34-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
35-
COMMENT "${CLANG_FORMAT_EXECUTABLE} ${ARG_OPTIONS} ${ARG_FILES}")
31+
if(CLANG_FORMAT_EXECUTABLE)
32+
add_custom_target(
33+
${TARGET}
34+
COMMAND ${CLANG_FORMAT_EXECUTABLE} ${ARG_OPTIONS} ${ARG_FILES}
35+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
36+
COMMENT "${CLANG_FORMAT_EXECUTABLE} ${ARG_OPTIONS} ${ARG_FILES}")
37+
else()
38+
message(WARNING "clang-format not found, target ${TARGET} not created")
39+
endif()
3640
endfunction()

0 commit comments

Comments
 (0)