From e2a1a1167a247643282d4e2681b1db233486826b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 17 Dec 2019 15:56:31 +0100
Subject: [PATCH] [CMake] update PROJECT use
---
CMakeLists.txt | 12 +++---------
cmake | 2 +-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb3189f..d0a04f5 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 77f090f..349e9bc 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 77f090f48bb32ccaea39a2670a74670a5e3be928
+Subproject commit 349e9bcac4a3006b61d5eff2956d3cf2f3595dce
--
GitLab