Unverified Commit 5e238b2c authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into chem_snap

parents ba26b2f7 7a00ec90
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ endif()

include(Testing)
include(CodeCoverage)
include(CodingStandard)

###############################################################################
# Print package summary
+34 −0
Original line number Diff line number Diff line
if(CMAKE_VERSION VERSION_LESS 3.12)
    find_package(PythonInterp 3.5 QUIET) # Deprecated since version 3.12
    if(PYTHONINTERP_FOUND)
        set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
        set(Python3_VERSION ${PYTHON_VERSION_STRING})
    endif()
else()
    find_package(Python3 COMPONENTS Interpreter QUIET)
endif()

if (Python3_EXECUTABLE)
    if(Python3_VERSION VERSION_GREATER_EQUAL 3.5)
        add_custom_target(
          check-whitespace
          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py .
          WORKING_DIRECTORY  ${LAMMPS_DIR}
          COMMENT "Check for whitespace errors")
        add_custom_target(
          check-permissions
          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py .
          WORKING_DIRECTORY  ${LAMMPS_DIR}
          COMMENT "Check for permission errors")
        add_custom_target(
          fix-whitespace
          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py -f .
          WORKING_DIRECTORY  ${LAMMPS_DIR}
          COMMENT "Fix whitespace errors")
        add_custom_target(
          fix-permissions
          ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/permissions.py -f .
          WORKING_DIRECTORY  ${LAMMPS_DIR}
          COMMENT "Fix permission errors")
    endif()
endif()
+46 −0
Original line number Diff line number Diff line
# Find clang-format
find_program(ClangFormat_EXECUTABLE NAMES clang-format
                                          clang-format-10.0
                                          clang-format-9.0
                                          clang-format-8.0
                                          clang-format-7.0
                                          clang-format-6.0
                                     DOC "clang-format executable")
mark_as_advanced(ClangFormat_EXECUTABLE)

if(ClangFormat_EXECUTABLE)
  # find version
  execute_process(COMMAND ${ClangFormat_EXECUTABLE} --version
                  OUTPUT_VARIABLE clang_format_version
                  ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)


  if(clang_format_version MATCHES "^clang-format version .*")
    # Arch Linux
    # clang-format version 10.0.0

    # Ubuntu 18.04 LTS Output
    # clang-format version 6.0.0-1ubuntu2 (tags/RELEASE_600/final)
    string(REGEX REPLACE "clang-format version ([0-9.]+).*"
                         "\\1"
                         ClangFormat_VERSION
                         "${clang_format_version}")
  elseif(clang_format_version MATCHES ".*LLVM version .*")
    # CentOS 7 Output
    # LLVM (http://llvm.org/):
    #   LLVM version 3.4.2
    #   Optimized build.
    #   Built Nov  1 2018 (15:06:24).
    #   Default target: x86_64-redhat-linux-gnu
    #   Host CPU: x86-64
    string(REGEX REPLACE ".*LLVM version ([0-9.]+).*"
                         "\\1"
                         ClangFormat_VERSION
                         "${clang_format_version}")
  else()
    set(ClangFormat_VERSION "0.0")
  endif()
endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ClangFormat REQUIRED_VARS ClangFormat_EXECUTABLE VERSION_VAR ClangFormat_VERSION)
+1 −1
Original line number Diff line number Diff line
.TH LAMMPS "2 June 2020" "2020-06-02"
.TH LAMMPS "15 June 2020" "2020-06-15"
.SH NAME
.B LAMMPS
\- Molecular Dynamics Simulator.
+0 −0

File mode changed from 100755 to 100644.

Loading