diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb3189fa6ee8b5b2560bad2ee62a22ac3158009d..d0a04f5904bd79a8a1987f0fc98c517b072ea045 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,14 +16,8 @@ set(CXX_DISABLE_WERROR True)
 INCLUDE(cmake/base.cmake)
 
 # Specify the project.
-cmake_policy(SET CMP0048 NEW)
-PROJECT(${PROJECT_NAME}
-  LANGUAGES
-  CXX
-  VERSION
-  ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
-  )
-
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp)
@@ -57,7 +51,7 @@ ADD_LIBRARY(${PROJECT_NAME}
 
 INSTALL(TARGETS
   ${PROJECT_NAME}
-  EXPORT ${TARGETS_EXPORT_NAME}  
+  EXPORT ${TARGETS_EXPORT_NAME}
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
  # DESTINATION bin
diff --git a/cmake b/cmake
index 77f090f48bb32ccaea39a2670a74670a5e3be928..349e9bcac4a3006b61d5eff2956d3cf2f3595dce 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 77f090f48bb32ccaea39a2670a74670a5e3be928
+Subproject commit 349e9bcac4a3006b61d5eff2956d3cf2f3595dce