From 5d7de5be6f342939f1b5f7f80850da4bf9c3ff48 Mon Sep 17 00:00:00 2001 From: Giulio Romualdi Date: Thu, 19 Dec 2019 22:21:56 +0100 Subject: [PATCH 1/2] Add ModelTestUtils.h file to the installed headers --- src/model/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/model/CMakeLists.txt b/src/model/CMakeLists.txt index f716378e2ab..c4701b49b0f 100644 --- a/src/model/CMakeLists.txt +++ b/src/model/CMakeLists.txt @@ -32,9 +32,8 @@ set(IDYNTREE_MODEL_HEADERS include/iDynTree/Model/ContactWrench.h include/iDynTree/Model/PrismaticJoint.h include/iDynTree/Model/SolidShapes.h include/iDynTree/Model/SubModel.h - include/iDynTree/Model/Traversal.h) - -set(IDYNTREE_MODEL_PRIVATE_INCLUDES include/iDynTree/Model/ModelTestUtils.h) + include/iDynTree/Model/Traversal.h + include/iDynTree/Model/ModelTestUtils.h) set(IDYNTREE_MODEL_SOURCES src/ContactWrench.cpp src/DenavitHartenberg.cpp @@ -62,11 +61,10 @@ set(IDYNTREE_MODEL_SOURCES src/ContactWrench.cpp SOURCE_GROUP("Source Files" FILES ${IDYNTREE_MODEL_SOURCES}) SOURCE_GROUP("Header Files" FILES ${IDYNTREE_MODEL_HEADERS}) -SOURCE_GROUP("Header Files\\Private" FILES ${IDYNTREE_MODEL_PRIVATE_INCLUDES}) set(libraryname idyntree-model) -add_library(${libraryname} ${IDYNTREE_MODEL_SOURCES} ${IDYNTREE_MODEL_HEADERS} ${IDYNTREE_MODEL_PRIVATE_INCLUDES}) +add_library(${libraryname} ${IDYNTREE_MODEL_SOURCES} ${IDYNTREE_MODEL_HEADERS}) target_include_directories(${libraryname} PUBLIC "$" "$" From 626632ca21b9ac03cb03ed65f0d831860acafedb Mon Sep 17 00:00:00 2001 From: Giulio Romualdi Date: Thu, 19 Dec 2019 22:25:51 +0100 Subject: [PATCH 2/2] Update the changelog --- doc/releases/v0_12.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/releases/v0_12.md b/doc/releases/v0_12.md index d62926f7988..71bc86fbeb8 100644 --- a/doc/releases/v0_12.md +++ b/doc/releases/v0_12.md @@ -74,6 +74,7 @@ to normalize errors or as initial points of a nonlinear optimization procedure. ### `Model` * Implement `getTotalMass()` method for Model class +* Enable the installation of the `ModelTestUtils.h` file (https://github.com/robotology/idyntree/pull/607) ### `modelio` * Added `iDynTree::ModelExporter` class to export `iDynTree::Model` instances to URDF files (https://github.com/robotology/idyntree/pull/554).