Skip to content

Commit

Permalink
Put back in cppcheck version message. Refs #4368.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Jan 4, 2012
1 parent 51a44f4 commit 6eab3a5
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Code/Mantid/Build/CMake/FindCppcheck.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ if(CPPCHECK_EXECUTABLE OR CPPCHECK_MARK_AS_ADVANCED)
mark_as_advanced(CPPCHECK_ROOT_DIR)
endif()

#if(CPPCHECK_EXECUTABLE)
if(CPPCHECK_EXECUTABLE)
# if(NOT TARGET cppcheck)
# add_custom_target(cppcheck)
# set_target_properties(cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
# endif()
# execute_process ( COMMAND ${CPPCHECK_EXECUTABLE} --version
# OUTPUT_VARIABLE CPPCHECK_VERSION
# OUTPUT_STRIP_TRAILING_WHITESPACE )
# string ( TOUPPER ${CPPCHECK_VERSION} CPPCHECK_VERSION )
# string ( REPLACE "CPPCHECK" "" CPPCHECK_VERSION ${CPPCHECK_VERSION} )
# string ( STRIP ${CPPCHECK_VERSION} CPPCHECK_VERSION )
# message ( STATUS "cppcheck version: ${CPPCHECK_VERSION}" )
#endif()
execute_process ( COMMAND ${CPPCHECK_EXECUTABLE} --version
OUTPUT_VARIABLE CPPCHECK_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE )
string ( TOUPPER ${CPPCHECK_VERSION} CPPCHECK_VERSION )
string ( REPLACE "CPPCHECK" "" CPPCHECK_VERSION ${CPPCHECK_VERSION} )
string ( STRIP ${CPPCHECK_VERSION} CPPCHECK_VERSION )
message ( STATUS "cppcheck version: ${CPPCHECK_VERSION}" )
endif()

mark_as_advanced(CPPCHECK_EXECUTABLE)
set ( CPPCHECK_ARGS "--enable=all" CACHE STRING "Arguments for running cppcheck" )
Expand Down

0 comments on commit 6eab3a5

Please sign in to comment.