Skip to content

Commit

Permalink
Merge pull request orocos-toolchain#100 from phyrog/master
Browse files Browse the repository at this point in the history
RTT fails when using gcc5
  • Loading branch information
meyerj committed Jun 30, 2015
2 parents 951b314 + 469303b commit 5a9451b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions config/check_depend.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -309,18 +309,18 @@ 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}")
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])?")
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)
Expand Down

0 comments on commit 5a9451b

Please sign in to comment.