Skip to content

Commit

Permalink
Remove gccfilter in favor of the default feature of GCC and Clang (#1464
Browse files Browse the repository at this point in the history
)
  • Loading branch information
jslee02 authored May 11, 2020
1 parent 19c33a6 commit becbead
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 564 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
* Added support new if() IN_LIST operator in DARTConfig.cmake: [#1434](https://github.com/dartsim/dart/pull/1434)
* Updated Findfcl.cmake to support FCL 0.6: [#1441](https://github.com/dartsim/dart/pull/1441)
* Added gtest macros for Eigen object comparisons: [#1443](https://github.com/dartsim/dart/pull/1443)
* Removed gccfilter: [#1464](https://github.com/dartsim/dart/pull/1464)

### [DART 6.9.2 (2019-08-16)](https://github.com/dartsim/dart/milestone/60?closed=1)

Expand Down
31 changes: 17 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ option(DART_CODECOV "Turn on codecov support" OFF)
option(DART_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
option(DART_FAST_DEBUG "Add -O1 option for DEBUG mode build" OFF)
option(DART_BUILD_DARTPY "Build dartpy (the python binding)" OFF)
# GCC and Clang add ANSI-formatted colors when they detect the output medium is a
# terminal. However, this doesn't work in some cases such as when the makefile is
# invoked by Ninja. DART_FORCE_COLORED_OUTPUT can be used in this case to enforce
# to always generate ANSI-formatted colors regardless of the output medium types.
# See: https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949
option(DART_FORCE_COLORED_OUTPUT
"Always produce ANSI-colored output (GNU/Clang only)." OFF)

if(DART_BUILD_DARTPY)
set(BUILD_SHARED_LIBS OFF)
Expand Down Expand Up @@ -216,6 +223,11 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")

# Enforce to colorize compilation output
if(${DART_FORCE_COLORED_OUTPUT})
add_compile_options(-fdiagnostics-color=always)
endif()

elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")

if(DART_TREAT_WARNINGS_AS_ERRORS)
Expand All @@ -242,6 +254,11 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")

# Enforce to colorize compilation output
if(${DART_FORCE_COLORED_OUTPUT})
add_compile_options(-fcolor-diagnostics)
endif()

else()

message(SEND_ERROR "Compiler[${CMAKE_CXX_COMPILER_ID}] not supported.")
Expand Down Expand Up @@ -577,20 +594,6 @@ if(DOXYGEN_FOUND)

endif()

#===============================================================================
# Coloring build outputs using gccfilter if appliciable
# Ref: http://stackoverflow.com/questions/14399984/make-cmake-use-gccfilter
#===============================================================================
if("${PERLMODULES_FOUND}" STREQUAL "TRUE")
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCPP)
option(COLOR_GCC "Use GCCFilter to color compiler output messages" ON)
set(COLOR_GCC_OPTIONS "-c -r -w" CACHE STRING "Arguments that are passed to gccfilter when output coloring is switchend on. Defaults to -c -r -w.")
if(COLOR_GCC)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${PROJECT_SOURCE_DIR}/tools/gccfilter ${COLOR_GCC_OPTIONS}")
endif()
endif()
endif()

#===============================================================================
# Build Instructions
#===============================================================================
Expand Down
10 changes: 0 additions & 10 deletions cmake/DARTFindDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,6 @@ endif()
# Misc. dependencies
#--------------------

# Perl modules
find_package(PerlModules COMPONENTS Regexp::Common Getopt::ArgvFile Getopt::Long Term::ANSIColor QUIET)
if(DART_VERBOSE)
if("${PERLMODULES_FOUND}" STREQUAL "TRUE")
message(STATUS "Looking for PerlModules - found")
else()
message(WARNING "Looking for PerlModules - NOT found, to colorize gcc messages, please install Regexp::Common Getopt::ArgvFile Getopt::Long Term::ANSIColor (http://www.cpan.org/modules/INSTALL.html)")
endif()
endif()

# Doxygen
find_package(Doxygen QUIET)
dart_check_optional_package(DOXYGEN "generating API documentation" "doxygen")
78 changes: 0 additions & 78 deletions cmake/FindPerlModules.cmake

This file was deleted.

Loading

0 comments on commit becbead

Please sign in to comment.