From 1b7e8cb7260733f22fdd56550c362c84bbf66e47 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 10 Jan 2017 19:57:38 +0100 Subject: [PATCH] cmake: remove gcc version check in check_depend.cmake (fix #166) Signed-off-by: Johannes Meyer --- config/check_depend.cmake | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/config/check_depend.cmake b/config/check_depend.cmake index 5f96be58c..ab0fbefbd 100644 --- a/config/check_depend.cmake +++ b/config/check_depend.cmake @@ -283,9 +283,11 @@ endif() INCLUDE_DIRECTORIES( ${OROCOS-RTT_INCLUDE_DIRS} ) # -# Disable line wrapping for g++ such that eclipse can parse the errors. +# Set compiler specific options # IF(CMAKE_COMPILER_IS_GNUCXX) + SET(RTT_GCC_HASVISIBILITY TRUE) + # Disable line wrapping for g++ such that eclipse can parse the errors. SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0") ENDIF(CMAKE_COMPILER_IS_GNUCXX) @@ -293,39 +295,6 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Int SET(RTT_GCC_HASVISIBILITY TRUE) ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel") -# -# If we're using gcc, make sure the version is OK. -# -IF (CMAKE_COMPILER_IS_GNUCXX) - # this is a workaround distcc: - IF ( CMAKE_CXX_COMPILER_ARG1 ) - STRING(REPLACE " " "" CMAKE_CXX_COMPILER_ARG1 ${CMAKE_CXX_COMPILER_ARG1} ) - #MESSAGE("Invoking: '${CMAKE_CXX_COMPILER_ARG1} -dumpversion'") - EXECUTE_PROCESS( COMMAND ${CMAKE_CXX_COMPILER_ARG1} -dumpversion RESULT_VARIABLE CXX_HAS_VERSION OUTPUT_VARIABLE CXX_VERSION) - ELSE ( CMAKE_CXX_COMPILER_ARG1 ) - #MESSAGE("Invoking: ${CMAKE_CXX_COMPILER} -dumpversion") - EXECUTE_PROCESS( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion RESULT_VARIABLE CXX_HAS_VERSION OUTPUT_VARIABLE CXX_VERSION) - ENDIF ( CMAKE_CXX_COMPILER_ARG1 ) - - IF ( ${CXX_HAS_VERSION} EQUAL 0 ) - # We are assuming here that -dumpversion is gcc specific. - IF( CXX_VERSION MATCHES "[4-5]\\.[0-9](\\.[0-9])?" ) - MESSAGE(STATUS "Detected gcc4/5: ${CXX_VERSION}") - SET(RTT_GCC_HASVISIBILITY TRUE) - ELSE(CXX_VERSION MATCHES "[4-5]\\.[0-9](\\.[0-9])?") - IF( CXX_VERSION MATCHES "3\\.[0-9](\\.[0-9])?" ) - MESSAGE(STATUS "Detected gcc3: ${CXX_VERSION}") - ELSE( CXX_VERSION MATCHES "3\\.[0-9](\\.[0-9])?" ) - MESSAGE("ERROR: You seem to be using gcc version:") - MESSAGE("${CXX_VERSION}") - MESSAGE( FATAL_ERROR "ERROR: For gcc, Orocos requires version 4.x or 3.x") - ENDIF( CXX_VERSION MATCHES "3\\.[0-9](\\.[0-9])?" ) - ENDIF(CXX_VERSION MATCHES "[4-5]\\.[0-9](\\.[0-9])?") - ELSE ( ${CXX_HAS_VERSION} EQUAL 0) - MESSAGE("Could not determine gcc version: ${CXX_HAS_VERSION}") - ENDIF ( ${CXX_HAS_VERSION} EQUAL 0) -ENDIF() - # # Set flags for code coverage, and setup coverage target #