Skip to content

Commit 3859b87

Browse files
author
Sankar Natarajan
committed
Merge branch 'use_cxx14' into 'master'
Use CXX14 See merge request dfki-planning/collision_detection!4
2 parents 8481925 + af389a0 commit 3859b87

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# CMakeLists.txt has to be located in the project folder and cmake has to be
22
# executed from 'project/build' with 'cmake ../'.
33
cmake_minimum_required(VERSION 2.6)
4-
set(CMAKE_CXX_STANDARD 11)
4+
set(CMAKE_CXX_STANDARD 14)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66
set(CMAKE_CXX_EXTENSIONS OFF)
77
find_package(Rock)

src/collision_detection.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ Description: @PROJECT_DESCRIPTION@
88
Version: @PROJECT_VERSION@
99
Requires: @PKGCONFIG_REQUIRES@
1010
Libs: -L${libdir} -l@TARGET_NAME@ @PKGCONFIG_LIBS@
11-
Cflags: -std=c++11 -I${includedir} @PKGCONFIG_CFLAGS@
11+
Cflags: -std=c++14 -I${includedir} @PKGCONFIG_CFLAGS@
1212

0 commit comments

Comments
 (0)