Commit 0738dd0a authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'fix_apple_format' into 'master' 

Fix CMake Logic for clang-format on macOS

See merge request allpix-squared/allpix-squared!1078
parents 34382c0f e92c406e

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ NamespaceIndentation: All 
PointerAlignment: Left

SpaceBeforeParens: Never

Cpp11BracedListStyle: true

Standard: Cpp11

IndentWidth: 4

TabWidth: 4

UseTab: Never

cmake/clang-cpp-checks.cmake

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ IF(CLANG_FORMAT) 
    STRING(REGEX REPLACE ".* ([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CLANG_MAJOR_VERSION ${CLANG_VERSION})



    # Let's treat macOS differently because they don't have up-to-date versions

    IF(${CLANG_MAJOR_VERSION} EQUAL ${CLANG_FORMAT_VERSION} OR DEFINED ${APPLE})

    IF(${CLANG_MAJOR_VERSION} EQUAL ${CLANG_FORMAT_VERSION} OR DEFINED APPLE)

        # On macOS we might have the right version - or not..

        IF(NOT ${CLANG_MAJOR_VERSION} EQUAL ${CLANG_FORMAT_VERSION})

            MESSAGE(