Skip to content

Commit 48d1eea

Browse files
Add support for gcc 5
gcc 5 needs -std=c++0x to compile lslboost (based on boost 1.55). As CMAKE_CXX_COMPILER_VERSION is only available since CMake 2.8.8, if an older version of cmake is used, we assume gcc version is inferior to 5.
1 parent 072563f commit 48d1eea

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

external/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,14 @@ else () # WIN32
5858
)
5959
set_property (TARGET boost PROPERTY COMPILE_DEFINITIONS BOOST_ALL_NO_LIB BOOST_THREAD_BUILD_LIB)
6060
endif (UNIX)
61+
62+
# gcc 5 needs -std=c++0x to compile lslboost
63+
# CMAKE_CXX_COMPILER_VERSION is only available since CMake 2.8.8
64+
# If CMake version is inferior to 2.8.8, we assume gcc version is inferior to 5
65+
if (CMAKE_VERSION VERSION_GREATER 2.8.8)
66+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
67+
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5)
68+
set_property (TARGET boost PROPERTY COMPILE_FLAGS " -std=c++0x" APPEND_STRING)
69+
endif ()
70+
endif ()
71+
endif ()

src/CMakeLists.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ if (BUILD_SHARED)
4646
else ()
4747
target_link_libraries (lsl ${Boost_LIBRARIES})
4848
endif ()
49+
50+
if (CMAKE_VERSION VERSION_GREATER 2.8.8)
51+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
52+
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5)
53+
set_property (TARGET lsl PROPERTY COMPILE_FLAGS " -std=c++0x" APPEND_STRING)
54+
endif ()
55+
endif ()
56+
endif()
57+
4958
endif (BUILD_SHARED)
5059

5160
if (BUILD_STATIC)
@@ -58,6 +67,15 @@ if (BUILD_STATIC)
5867
set_target_properties (lsl-static PROPERTIES OUTPUT_NAME lsl)
5968
target_link_libraries (lsl-static ${Boost_LIBRARIES} rt pthread)
6069
endif ()
70+
71+
if (CMAKE_VERSION VERSION_GREATER 2.8.8)
72+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
73+
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5)
74+
set_property (TARGET lsl-static PROPERTY COMPILE_FLAGS " -std=c++0x" APPEND_STRING)
75+
endif ()
76+
endif ()
77+
endif()
78+
6179
endif (BUILD_STATIC)
6280

6381

0 commit comments

Comments
 (0)