diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e98245..ce969a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -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)
 
@@ -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}")
diff --git a/cmake b/cmake
index 046c3be..52fd089 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 046c3be5553c4ea340eb672d0289627f0c07b1a4
+Subproject commit 52fd089803657a9deab13c9af66581a2da5724f0