Merge branch 'upstream' into sandbox/dh0128.kwak/behaviortree-cpp_3.6.1
authorDongHun Kwak <dh0128.kwak@samsung.com>
Thu, 14 Apr 2022 03:32:37 +0000 (12:32 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Thu, 14 Apr 2022 03:32:37 +0000 (12:32 +0900)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
@@@ -9,34 -9,10 +9,13 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
  set(CMAKE_CXX_STANDARD 14)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
 +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
 +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 +
  if(MSVC)
      add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- endif()
- #---- Include boost to add coroutines ----
- find_package(Boost COMPONENTS coroutine QUIET)
- if(Boost_FOUND)
-     string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION})
-     if(NOT Boost_VERSION_NODOT VERSION_LESS 105900)
-         message(STATUS "Found boost::coroutine2.")
-         add_definitions(-DBT_BOOST_COROUTINE2)
-         set(BT_COROUTINES true)
-     elseif(NOT Boost_VERSION_NODOT VERSION_LESS 105300)
-         message(STATUS "Found boost::coroutine.")
-         add_definitions(-DBT_BOOST_COROUTINE)
-         set(BT_COROUTINES true)
-     endif()
-     include_directories(${Boost_INCLUDE_DIRS})
- endif()
- if(NOT DEFINED BT_COROUTINES)
-     message(STATUS "Coroutines disabled. Install Boost to enable them (version 1.59+ recommended).")
-     add_definitions(-DBT_NO_COROUTINES)
+ else()
+     add_definitions(-Wpedantic)
  endif()
  
  set(CMAKE_POSITION_INDEPENDENT_CODE ON)