From 00ca3a816feded8b54b32a1245445f6624d85d18 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 23 Dec 2019 17:48:46 +0100
Subject: [PATCH] [cmake] Remove useless CMakeLists.txt informations. Based on
feedback from G. Saurel.
---
CMakeLists.txt | 18 ++++------
include/dynamic-graph/CMakeLists.txt | 53 ----------------------------
src/CMakeLists.txt | 11 +++---
3 files changed, 12 insertions(+), 70 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3ef177..573bbc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Copyright 2010, Olivier Stasse, JRL, CNRS/AIST
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+# Setup project properties
SET(PROJECT_ORG stack-of-tasks)
SET(PROJECT_NAME dynamic-graph)
SET(PROJECT_DESCRIPTION "Dynamic graph library")
@@ -19,14 +19,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})
# jrl-cmakemodules handling of usual modules
INCLUDE(cmake/header.cmake)
@@ -53,7 +47,7 @@ set(PACKAGE_EXTRA_MACROS
# Specific to PKG module
# FIXME: to be changed into lib/dynamic-graph
-# to avoid name collision whenX installing dynamic-graph in /usr.
+# to avoid name collision when installing dynamic-graph in /usr.
SET(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/plugin")
# Add extra keys to pkg-config file to export the location of the
@@ -225,7 +219,9 @@ SETUP_PROJECT_PACKAGE_FINALIZE()
get_cmake_property(_variableNames VARIABLES)
list (SORT _variableNames)
foreach (_variableName ${_variableNames})
- message(STATUS "${_variableName}=${${_variableName}}")
+ LIST(APPEND LOGGING_WATCHED_VARIABLES
+ ${_variableName}
+ )
endforeach()
MESSAGE(STATUS "dynamic_graph_VERSION=${dynamic_graph_VERSION}")
diff --git a/include/dynamic-graph/CMakeLists.txt b/include/dynamic-graph/CMakeLists.txt
index 5baf981..e69de29 100644
--- a/include/dynamic-graph/CMakeLists.txt
+++ b/include/dynamic-graph/CMakeLists.txt
@@ -1,53 +0,0 @@
-SET(${PROJECT_NAME}_HEADERS
- fwd.hh
- null-ptr.hh
- debug.h
- real-time-logger.h
-
- dynamic-graph-api.h
-
- entity.h
- factory.h
- pool.h
-
- exception-abstract.h
- exception-factory.h
- exception-signal.h
- exception-traces.h
-
- signal.h
- signal-array.h
- signal-base.h
- signal-ptr.h
- signal-time-dependent.h
- signal-ptr.t.cpp
- signal.t.cpp
- time-dependency.h
- time-dependency.t.cpp
- signal-caster.h
- signal-cast-helper.h
- all-signals.h
- signal-helper.h
- entity-helper.h
-
- tracer.h
- tracer-real-time.h
-
- command.h
- eigen-io.h
- linear-algebra.h
- value.h
-
- command-setter.h
- command-setter.t.cpp
- command-getter.h
- command-getter.t.cpp
- command-direct-getter.h
- command-direct-setter.h
- command-bind.h
- all-commands.h
-
- logger.h
-)
-
-SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62ef700..5558662 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,15 +40,14 @@ ADD_LIBRARY(${LIBRARY_NAME}
command/command.cpp
)
-INSTALL(TARGETS ${PROJECT_NAME}
- EXPORT ${TARGETS_EXPORT_NAME}
- PUBLIC_HEADER
- INCLUDES DESTINATION include/${PROJECT_NAME}
- )
+# INSTALL(TARGETS ${PROJECT_NAME}
+# EXPORT ${TARGETS_EXPORT_NAME}
+# PUBLIC_HEADER
+# INCLUDES DESTINATION include/${PROJECT_NAME}
+# )
target_include_directories(${PROJECT_NAME}
PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>
)
--
GitLab