From 2b04f450950fe725864e3c97ec782571a9c651f6 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 20 Jun 2018 17:05:23 -0500 Subject: [PATCH] update build system and documentation --- cmake/setup_custom_targets.cmake | 12 ++++++------ doc/doxygen/headers/coding_conventions.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/setup_custom_targets.cmake b/cmake/setup_custom_targets.cmake index c3de2b9cf1..ef28ba82d6 100644 --- a/cmake/setup_custom_targets.cmake +++ b/cmake/setup_custom_targets.cmake @@ -103,18 +103,18 @@ ENDIF() # Provide an indentation target for indenting uncommitted changes and changes on # the current feature branch # -ADD_CUSTOM_TARGET(indent-branch +ADD_CUSTOM_TARGET(indent WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ./contrib/utilities/indent-branch + COMMAND ./contrib/utilities/indent COMMENT "Indenting recently changed files in the deal.II directories" ) # # Provide "indent" target for indenting all headers and source files # -ADD_CUSTOM_TARGET(indent +ADD_CUSTOM_TARGET(indent-all WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ./contrib/utilities/indent + COMMAND ./contrib/utilities/indent-all COMMENT "Indenting all files in the deal.II directories" ) @@ -155,9 +155,9 @@ FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_info.cmake # setup_tests - set up testsuite subprojects # prune_tests - remove all testsuite subprojects # -# indent - indent all headers and source files -# indent-branch - indent all headers and source files that changed since the +# indent - indent all headers and source files that changed since the # last commit to master, including untracked ones +# indent-all - indent all headers and source files ") # diff --git a/doc/doxygen/headers/coding_conventions.h b/doc/doxygen/headers/coding_conventions.h index 2cedd9cd3b..c373cb14e5 100644 --- a/doc/doxygen/headers/coding_conventions.h +++ b/doc/doxygen/headers/coding_conventions.h @@ -50,7 +50,7 @@ on each of your files. This will make sure indentation is conforming to the style guidelines outlined in this page. Alternatively, you can run 
-  make indent-branch
+  make indent
in whatever directory you set up the library to be compiled in to indent all -- 2.39.5