Skip to content

Commit

Permalink
[CMake] require C++11
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Nov 5, 2019
1 parent c55d498 commit adc75b7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
cmake_minimum_required(VERSION 2.8.3)

set(CXX_DISABLE_WERROR True)
SET(CMAKE_CXX_STANDARD 11)
set(WARNING_CXX_FLAGS "${WARNING_CXX_FLAGS} -Werror=format-security")

set(PROJECT_NAMESPACE stack-of-tasks)
Expand All @@ -17,7 +18,8 @@ include(cmake/ros.cmake)
include(cmake/GNUInstallDirs.cmake)
include(cmake/python.cmake)

project(roscontrol_sot)
CMAKE_POLICY(SET CMP0048 OLD)
project(roscontrol_sot CXX)

find_package(PkgConfig REQUIRED)

Expand Down Expand Up @@ -50,9 +52,6 @@ include_directories(include tests ${bullet_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

link_directories(${bullet_LIBRARY_DIRS})

CMAKE_POLICY(SET CMP0048 OLD)
PROJECT(${PROJECT_NAME} CXX)

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_INSTALL_RPATH "${LIBRARY_OUTPUT_PATH}")
Expand Down
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 3 files
+16 −6 doxygen/header.html
+7 −7 pkg-config.cmake
+19 −1 version.cmake

0 comments on commit adc75b7

Please sign in to comment.