Commit 032d1d16 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Prefer clang-format-6 to be compatible with CI

parent 9679d374
Pipeline #584141 passed with stages
in 5 minutes and 7 seconds
......@@ -7,7 +7,7 @@ IF(NOT CHECK_CXX_SOURCE_FILES)
ENDIF()
# Adding clang-format check and formatter if found
FIND_PROGRAM(CLANG_FORMAT NAMES "clang-format-7" "clang-format-6.0" "clang-format-5.0" "clang-format-4.0" "clang-format")
FIND_PROGRAM(CLANG_FORMAT NAMES "clang-format-6.0" "clang-format-5.0" "clang-format-4.0" "clang-format" "clang-format-7")
IF(CLANG_FORMAT)
MESSAGE(STATUS "Found ${CLANG_FORMAT}, adding formatting targets")
ADD_CUSTOM_TARGET(
......
......@@ -8,7 +8,7 @@
##################################################################
# SETTINGS
# set path to clang-format binary
for bin in "clang-format" "clang-format-7" "clang-format-6.0" "clang-format-5.0" "clang-format-4.0";
for bin in "clang-format-6.0" "clang-format-5.0" "clang-format-4.0" "clang-format-7" "clang-format";
do
CLANG_FORMAT=$(which "$bin")
[ -n "$CLANG_FORMAT" ] && break
......
......@@ -8,10 +8,9 @@
#pragma link off all functions;
// Missing ROOT objects
#pragma link C++ class ROOT::Math::Cartesian2D < unsigned int> + ;
#pragma link C++ class ROOT::Math::DisplacementVector2D < ROOT::Math::Cartesian2D < unsigned int>, \
ROOT::Math::DefaultCoordinateSystemTag> + \
;
#pragma link C++ class ROOT::Math::Cartesian2D < unsigned int > +;
#pragma link C++ class ROOT::Math::DisplacementVector2D < ROOT::Math::Cartesian2D < unsigned int >, \
ROOT::Math::DefaultCoordinateSystemTag > +;
// AP2 objects
#pragma link C++ class corryvreckan::Object + ;
......@@ -24,4 +23,4 @@
#pragma link C++ class corryvreckan::MCParticle + ;
// Vector of Object for internal storage
#pragma link C++ class std::vector < corryvreckan::Object*> + ;
#pragma link C++ class std::vector < corryvreckan::Object* > +;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment