Skip to content
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

Fix system uncrustify version detection regex #32

Closed
wants to merge 1 commit into from
Closed

Fix system uncrustify version detection regex #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ macro(build_uncrustify)
TIMEOUT 600
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install
-DNoGitVersionString:BOOL=ON
${extra_cmake_args}
-Wno-dev
--no-warn-unused-cli
Expand Down Expand Up @@ -83,7 +84,7 @@ if(NOT res EQUAL 0)
set(need_local_build TRUE)
else()
# Before 0.65 uncrustify used a different versioning scheme so the regex won't match
string(REGEX REPLACE "^Uncrustify-(.*)_f$" "\\1" version_prefix_match "${out}")
string(REGEX REPLACE "^Uncrustify(_d|)-(.*)_f$" "\\2" version_prefix_match "${out}")
if(version_prefix_match STREQUAL "" OR version_prefix_match VERSION_LESS 0.72)
set(need_local_build TRUE)
endif()
Expand Down