From fcd3e9a3f98c1a80eb12a6140670c917aa92fcaa Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Sat, 13 Jun 2020 08:28:48 -0400 Subject: [PATCH] Make quiet Python 3 check --- cmake/Modules/CodingStandard.cmake | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/cmake/Modules/CodingStandard.cmake b/cmake/Modules/CodingStandard.cmake index d7440fba9d..467dbb2b16 100644 --- a/cmake/Modules/CodingStandard.cmake +++ b/cmake/Modules/CodingStandard.cmake @@ -1,21 +1,24 @@ if(CMAKE_VERSION VERSION_LESS 3.12) - find_package(PythonInterp) # Deprecated since version 3.12 + find_package(PythonInterp 3.5 QUIET) # Deprecated since version 3.12 if(PYTHONINTERP_FOUND) - set(Python_EXECUTABLE ${PYTHON_EXECUTABLE}) + set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) + set(Python3_VERSION ${PYTHON_VERSION_STRING}) endif() else() - find_package(Python COMPONENTS Interpreter) + find_package(Python3 COMPONENTS Interpreter QUIET) endif() -if (Python_EXECUTABLE) - add_custom_target( - check-whitespace - ${Python_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py . - WORKING_DIRECTORY ${LAMMPS_DIR} - COMMENT "Check for whitespace errors") - add_custom_target( - fix-whitespace - ${Python_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py -f . - WORKING_DIRECTORY ${LAMMPS_DIR} - COMMENT "Fix whitespace errors") +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( + fix-whitespace + ${Python3_EXECUTABLE} ${LAMMPS_TOOLS_DIR}/coding_standard/whitespace.py -f . + WORKING_DIRECTORY ${LAMMPS_DIR} + COMMENT "Fix whitespace errors") + endif() endif()