From b83a899b88a8a809de8b58168b74916c38990fde Mon Sep 17 00:00:00 2001 From: Tom Gehrke Date: Thu, 11 Jun 2015 15:01:08 +0200 Subject: [PATCH 1/2] Fix indentation --- config/check_depend.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/check_depend.cmake b/config/check_depend.cmake index c10b9f22e..b9213355f 100644 --- a/config/check_depend.cmake +++ b/config/check_depend.cmake @@ -312,11 +312,11 @@ IF (CMAKE_COMPILER_IS_GNUCXX) SET(RTT_GCC_HASVISIBILITY TRUE) ELSE(CXX_VERSION MATCHES "4\\.[0-9](\\.[0-9])?") IF( CXX_VERSION MATCHES "3\\.[0-9](\\.[0-9])?" ) - MESSAGE(STATUS "Detected gcc3: ${CXX_VERSION}") + 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") + 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\\.[0-9](\\.[0-9])?") ELSE ( ${CXX_HAS_VERSION} EQUAL 0) From 469303b24d1ea81c5a8bc803b2ab06c3d39c2a24 Mon Sep 17 00:00:00 2001 From: Tom Gehrke Date: Thu, 11 Jun 2015 15:01:28 +0200 Subject: [PATCH 2/2] Make rtt ready for gcc5 --- config/check_depend.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/check_depend.cmake b/config/check_depend.cmake index b9213355f..d22e19491 100644 --- a/config/check_depend.cmake +++ b/config/check_depend.cmake @@ -307,10 +307,10 @@ IF (CMAKE_COMPILER_IS_GNUCXX) IF ( ${CXX_HAS_VERSION} EQUAL 0 ) # We are assuming here that -dumpversion is gcc specific. - IF( CXX_VERSION MATCHES "4\\.[0-9](\\.[0-9])?" ) - MESSAGE(STATUS "Detected gcc4: ${CXX_VERSION}") + 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\\.[0-9](\\.[0-9])?") + 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])?" ) @@ -318,7 +318,7 @@ IF (CMAKE_COMPILER_IS_GNUCXX) 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\\.[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)