diff options
| author | Jonathan White <support@dmapps.us> | 2019-01-20 17:50:20 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2019-01-29 06:38:59 +0300 |
| commit | 7e1b16250c8a3b7854030c86af941d0b83d4a0b9 (patch) | |
| tree | 83fe30abc4e1e22f6ae5891cb2bf354e0dc90260 /cmake | |
| parent | c74664097b010b1c463011ec6ea07fd5c392a178 (diff) | |
Performed project-wide code formatting
* Updated format CMake command to properly
ignore new directories and files
* Added output when command is run
* Resolves #2623
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CLangFormat.cmake | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/cmake/CLangFormat.cmake b/cmake/CLangFormat.cmake index 3a0274236..70169ed72 100644 --- a/cmake/CLangFormat.cmake +++ b/cmake/CLangFormat.cmake @@ -15,10 +15,11 @@ set(EXCLUDED_DIRS # third-party directories - zxcvbn/ - streams/QtIOCompressor + src/zxcvbn/ # objective-c directories - autotype/mac) + src/touchid/ + src/autotype/mac/ + src/gui/macutils/) set(EXCLUDED_FILES # third-party files @@ -37,7 +38,7 @@ set(EXCLUDED_FILES core/ScreenLockListenerMac.h core/ScreenLockListenerMac.cpp) -file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h) +file(GLOB_RECURSE ALL_SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR} src/*.cpp src/*.h tests/*.cpp tests/*.h) foreach(SOURCE_FILE ${ALL_SOURCE_FILES}) foreach(EXCLUDED_DIR ${EXCLUDED_DIRS}) string(FIND ${SOURCE_FILE} ${EXCLUDED_DIR} SOURCE_FILE_EXCLUDED) @@ -52,7 +53,12 @@ foreach(SOURCE_FILE ${ALL_SOURCE_FILES}) endforeach() endforeach() -add_custom_target( - format - COMMAND echo ${ALL_SOURCE_FILES} | xargs clang-format -style=file -i -) +add_custom_target(format) +foreach(SOURCE_FILE ${ALL_SOURCE_FILES}) + add_custom_command( + TARGET format + PRE_BUILD + COMMAND echo Formatting ${SOURCE_FILE} + COMMAND clang-format -style=file -i \"${SOURCE_FILE}\" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endforeach() |