Commit 9f7d8c92 authored by Alexis Girault's avatar Alexis Girault
Browse files

COMP: Use release Uncrustify version 0.62

Some newer commits of uncrustify bring in a new
configuration method for Uncrustify that makes the
cmake integration more difficult.

Also edited the PREFIX directory inside the Superbuild
directory
parent c525f713
......@@ -31,12 +31,13 @@ if(NOT DEFINED ${PROJ}_EXECUTABLE AND NOT ${USE_SYSTEM_${PROJ}})
# Set project Git info
#-----------------------------------------------------------------------------
set(${proj}_REPOSITORY ${git_protocol}://github.com/uncrustify/uncrustify.git)
set(${proj}_GIT_TAG cf7bbac22c65df32dea3f0abf949cba80fc66d00)
set(${proj}_GIT_TAG uncrustify-0.62)
#-----------------------------------------------------------------------------
# Set project directory
#-----------------------------------------------------------------------------
set(${proj}_SOURCE_DIR ${CMAKE_BINARY_DIR}/Superbuild/${proj})
set(${proj}_SOURCE_DIR ${CMAKE_BINARY_DIR}/Superbuild/${proj}-src)
set(${proj}_PREFIX_DIR ${CMAKE_BINARY_DIR}/Superbuild/${proj}-prefix)
set(${proj}_DIR ${CMAKE_BINARY_DIR}/Superbuild/${proj}-build)
#-----------------------------------------------------------------------------
......@@ -47,9 +48,10 @@ if(NOT DEFINED ${PROJ}_EXECUTABLE AND NOT ${USE_SYSTEM_${PROJ}})
GIT_REPOSITORY ${${proj}_REPOSITORY}
GIT_TAG ${${proj}_GIT_TAG}
UPDATE_COMMAND ""
PREFIX ${${proj}_PREFIX_DIR}
SOURCE_DIR ${${proj}_SOURCE_DIR}
BINARY_DIR ${${proj}_DIR}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${${proj}_DIR}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<BINARY_DIR>
DEPENDS ${${proj}_DEPENDENCIES}
)
set(${PROJ}_EXECUTABLE ${${proj}_DIR}/bin/uncrustify)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment