diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ced02e7d647648931bbe3f35363168c61ea373a..2efa4798b774b168c2e9a63cd9b02b180fdd4827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,29 +9,28 @@ SET(PROJECT_URL "https://gepgitlab.laas.fr/${PROJECT_ORG}/${PROJECT_NAME}")
 INCLUDE(cmake/base.cmake)
 
 set(CXX_DISABLE_WERROR True)
-CMAKE_POLICY(SET CMP0048 OLD)
-PROJECT(${PROJECT_NAME} CXX)
+
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
 find_package(catkin REQUIRED)
 
 catkin_package(
-#  INCLUDE_DIRS include
-#  LIBRARIES talos_description
-#  CATKIN_DEPENDS other_catkin_pkg
-#  DEPENDS system_lib
-)
+  #  INCLUDE_DIRS include
+  #  LIBRARIES talos_description
+  #  CATKIN_DEPENDS other_catkin_pkg
+  #  DEPENDS system_lib
+  )
 
 # Find xml_reflection
 ADD_REQUIRED_DEPENDENCY("urdfdom >= 0.2.9")
 ADD_REQUIRED_DEPENDENCY("gazebo >= 7.0.0")
 ADD_REQUIRED_DEPENDENCY(roscpp)
 
-SET(LIBRARY_NAME ${PROJECT_NAME})
-
 ADD_LIBRARY(SpringPlugin
   SHARED
   src/SpringPlugin.cc
-)
+  )
 
 INSTALL(TARGETS
   SpringPlugin
@@ -45,5 +44,3 @@ FOREACH(dir config gazebo meshes robots urdf srdf launch)
   INSTALL(DIRECTORY ${dir}/
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
 ENDFOREACH(dir)
-
-SETUP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index b401621a9d8948554fce459d2bae8b5b85a872a1..f5e018896d0b1746a03f07ba02a5199e17eaee67 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b401621a9d8948554fce459d2bae8b5b85a872a1
+Subproject commit f5e018896d0b1746a03f07ba02a5199e17eaee67