Merge from core

This commit is contained in:
Jesse Beder
2014-03-25 22:07:21 -05:00
2 changed files with 9 additions and 8 deletions

View File

@@ -321,10 +321,8 @@ if(YAML_CPP_BUILD_TOOLS)
endif() endif()
### Formatting ### Formatting
if(${CMAKE_BUILD_TOOL} MATCHES make OR ${CMAKE_BUILD_TOOL} MATCHES gmake) get_property(all_sources GLOBAL PROPERTY SRCS_LIST)
get_property(all_sources GLOBAL PROPERTY SRCS_LIST) add_custom_target(format
add_custom_target(format
COMMAND clang-format --style=file -i ${all_sources} COMMAND clang-format --style=file -i ${all_sources}
COMMENT "Running clang-format" COMMENT "Running clang-format"
VERBATIM) VERBATIM)
endif()

View File

@@ -1,6 +1,9 @@
#include "scanscalar.h"
#include <algorithm>
#include "exp.h" #include "exp.h"
#include "regeximpl.h" #include "regeximpl.h"
#include "scanscalar.h"
#include "stream.h" #include "stream.h"
#include "yaml-cpp/exceptions.h" // IWYU pragma: keep #include "yaml-cpp/exceptions.h" // IWYU pragma: keep