Skip to content

Commit 96aac6c

Browse files
committed
Compilation fixed on Ubunru Xenial
1 parent 3b893cb commit 96aac6c

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

CMakeLists.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
cmake_minimum_required(VERSION 2.8.12) # version on Ubuntu Trusty
1+
cmake_minimum_required(VERSION 3.5.2) # version on Ubuntu Xenial
22
project(behaviortree_cpp_v3)
33

44
#---- Add the subdirectory cmake ----
55
set(CMAKE_CONFIG_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
66
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CONFIG_PATH}")
77

88
#---- Enable C++11 ----
9-
if(NOT CMAKE_VERSION VERSION_LESS 3.1)
10-
set(CMAKE_CXX_STANDARD 14)
11-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
12-
else()
13-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
14-
endif()
9+
set(CMAKE_CXX_STANDARD 14)
10+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1511

1612
if(MSVC)
1713
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -21,11 +17,11 @@ endif()
2117
find_package(Boost COMPONENTS coroutine QUIET)
2218
if(Boost_FOUND)
2319
include_directories(${Boost_INCLUDE_DIRS})
24-
if(Boost_VERSION VERSION_GREATER_EQUAL 105900)
20+
if(NOT Boost_VERSION VERSION_LESS 105900)
2521
message(STATUS "Found boost::coroutine2.")
2622
add_definitions(-DBT_BOOST_COROUTINE2)
2723
set(BT_COROUTINES true)
28-
elseif(Boost_VERSION_STRING VERSION_GREATER_EQUAL 105300)
24+
elseif(NOT Boost_VERSION VERSION_LESS 105300)
2925
message(STATUS "Found boost::coroutine.")
3026
include_directories(${Boost_INCLUDE_DIRS})
3127
add_definitions(-DBT_BOOST_COROUTINE)

0 commit comments

Comments
 (0)