Skip to content

some clang-tidy CMake integration improvements / fixed SOVERSION with multi-digit versions #4391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 4 commits into from
Aug 22, 2022
Merged

some clang-tidy CMake integration improvements / fixed SOVERSION with multi-digit versions #4391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0259892
versions.cmake: fixed extraction of multi-digit version parts
firewave Aug 22, 2022
6e5a064
clang_tidy.cmake: handle clang-tidy and compiler mismatch when precom…
firewave Aug 22, 2022
02dacde
clang_tidy.cmake: explicitly specify Python executable - fixes execut…
firewave Aug 22, 2022
274a8bd
clang_tidy.cmake: only perform nproc lookup if necessary as it may fail
firewave Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions cmake/clang_tidy.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,35 @@
if (NOT NPROC)
include(ProcessorCount)
ProcessorCount(NPROC)
if(NPROC EQUAL 0)
message(FATAL_ERROR "could not get processor count")
if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
# clang-tidy and clang need to have the same version when precompiled headers are beign used
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
string(REGEX MATCHALL "[0-9]+" _clang_ver_parts "${CMAKE_CXX_COMPILER_VERSION}")
LIST(GET _clang_ver_parts 0 _clang_major)
set(RUN_CLANG_TIDY_NAMES "run-clang-tidy-${_clang_major}")
message(STATUS "Clang and clang-tidy version need to match when precompiled headers are enabled - limiting search to '${RUN_CLANG_TIDY_NAMES}'")
else()
message(STATUS "Cannot use non-Clang compiler with clang-tidy when precompiled headers are enabled - skipping 'run-clang-tidy' target generation")
endif()
else()
set(RUN_CLANG_TIDY_NAMES run-clang-tidy run-clang-tidy-15 run-clang-tidy-14 run-clang-tidy-13 run-clang-tidy-12 run-clang-tidy-11 run-clang-tidy-10 run-clang-tidy-9 run-clang-tidy-8)
endif()
message(STATUS "NPROC=${NPROC}")

find_program(RUN_CLANG_TIDY NAMES run-clang-tidy run-clang-tidy-15 run-clang-tidy-14 run-clang-tidy-13 run-clang-tidy-12 run-clang-tidy-11 run-clang-tidy-10 run-clang-tidy-9 run-clang-tidy-8)
message(STATUS "RUN_CLANG_TIDY=${RUN_CLANG_TIDY}")
if (RUN_CLANG_TIDY)
# disable all compiler warnings since we are just interested in the tidy ones
add_custom_target(run-clang-tidy ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet)
if (BUILD_GUI)
add_dependencies(run-clang-tidy gui-build-deps)
if (BUILD_TESTS)
add_dependencies(run-clang-tidy triage-build-ui-deps)
if (RUN_CLANG_TIDY_NAMES)
find_program(RUN_CLANG_TIDY NAMES ${RUN_CLANG_TIDY_NAMES})
message(STATUS "RUN_CLANG_TIDY=${RUN_CLANG_TIDY}")
if (RUN_CLANG_TIDY)
include(ProcessorCount)
ProcessorCount(NPROC)
if(NPROC EQUAL 0)
message(FATAL_ERROR "could not get processor count")
endif()
message(STATUS "NPROC=${NPROC}")

# disable all compiler warnings since we are just interested in the tidy ones
add_custom_target(run-clang-tidy ${PYTHON_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet)
if (BUILD_GUI)
add_dependencies(run-clang-tidy gui-build-deps)
if (BUILD_TESTS)
add_dependencies(run-clang-tidy triage-build-ui-deps)
endif()
endif()
endif()
endif()
2 changes: 1 addition & 1 deletion cmake/versions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Version for libraries CPP
SET(VERSION "2.9.99")
STRING(REGEX MATCHALL "[0-9]" VERSION_PARTS "${VERSION}")
STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
LIST(GET VERSION_PARTS 1 VERSION_MINOR)
SET(SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
Expand Down