Skip to content

Commit 00ca3a8

Browse files
olivier-stasseOlivier Stasse
authored andcommitted
[cmake] Remove useless CMakeLists.txt informations.
Based on feedback from G. Saurel.
1 parent 51888e5 commit 00ca3a8

File tree

3 files changed

+12
-70
lines changed

3 files changed

+12
-70
lines changed

CMakeLists.txt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Copyright 2010, Olivier Stasse, JRL, CNRS/AIST
21
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
32

3+
# Setup project properties
44
SET(PROJECT_ORG stack-of-tasks)
55
SET(PROJECT_NAME dynamic-graph)
66
SET(PROJECT_DESCRIPTION "Dynamic graph library")
@@ -19,14 +19,8 @@ SET(CXX_DISABLE_WERROR TRUE)
1919
INCLUDE(cmake/base.cmake)
2020

2121
# Specify the project.
22-
cmake_policy(SET CMP0048 NEW)
23-
PROJECT(${PROJECT_NAME}
24-
LANGUAGES
25-
CXX
26-
VERSION
27-
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
28-
)
29-
22+
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
23+
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
3024

3125
# jrl-cmakemodules handling of usual modules
3226
INCLUDE(cmake/header.cmake)
@@ -53,7 +47,7 @@ set(PACKAGE_EXTRA_MACROS
5347

5448
# Specific to PKG module
5549
# FIXME: to be changed into lib/dynamic-graph
56-
# to avoid name collision whenX installing dynamic-graph in /usr.
50+
# to avoid name collision when installing dynamic-graph in /usr.
5751
SET(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/plugin")
5852

5953
# Add extra keys to pkg-config file to export the location of the
@@ -225,7 +219,9 @@ SETUP_PROJECT_PACKAGE_FINALIZE()
225219
get_cmake_property(_variableNames VARIABLES)
226220
list (SORT _variableNames)
227221
foreach (_variableName ${_variableNames})
228-
message(STATUS "${_variableName}=${${_variableName}}")
222+
LIST(APPEND LOGGING_WATCHED_VARIABLES
223+
${_variableName}
224+
)
229225
endforeach()
230226
231227
MESSAGE(STATUS "dynamic_graph_VERSION=${dynamic_graph_VERSION}")

include/dynamic-graph/CMakeLists.txt

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +0,0 @@
1-
SET(${PROJECT_NAME}_HEADERS
2-
fwd.hh
3-
null-ptr.hh
4-
debug.h
5-
real-time-logger.h
6-
7-
dynamic-graph-api.h
8-
9-
entity.h
10-
factory.h
11-
pool.h
12-
13-
exception-abstract.h
14-
exception-factory.h
15-
exception-signal.h
16-
exception-traces.h
17-
18-
signal.h
19-
signal-array.h
20-
signal-base.h
21-
signal-ptr.h
22-
signal-time-dependent.h
23-
signal-ptr.t.cpp
24-
signal.t.cpp
25-
time-dependency.h
26-
time-dependency.t.cpp
27-
signal-caster.h
28-
signal-cast-helper.h
29-
all-signals.h
30-
signal-helper.h
31-
entity-helper.h
32-
33-
tracer.h
34-
tracer-real-time.h
35-
36-
command.h
37-
eigen-io.h
38-
linear-algebra.h
39-
value.h
40-
41-
command-setter.h
42-
command-setter.t.cpp
43-
command-getter.h
44-
command-getter.t.cpp
45-
command-direct-getter.h
46-
command-direct-setter.h
47-
command-bind.h
48-
all-commands.h
49-
50-
logger.h
51-
)
52-
53-
SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})

src/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,14 @@ ADD_LIBRARY(${LIBRARY_NAME}
4040
command/command.cpp
4141
)
4242
43-
INSTALL(TARGETS ${PROJECT_NAME}
44-
EXPORT ${TARGETS_EXPORT_NAME}
45-
PUBLIC_HEADER
46-
INCLUDES DESTINATION include/${PROJECT_NAME}
47-
)
43+
# INSTALL(TARGETS ${PROJECT_NAME}
44+
# EXPORT ${TARGETS_EXPORT_NAME}
45+
# PUBLIC_HEADER
46+
# INCLUDES DESTINATION include/${PROJECT_NAME}
47+
# )
4848
4949
target_include_directories(${PROJECT_NAME}
5050
PUBLIC
51-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
5251
$<INSTALL_INTERFACE:include>
5352
)
5453

0 commit comments

Comments
 (0)