Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ModelTestUtils.h file to the installed headers #607

Merged
merged 2 commits into from
Dec 20, 2019
Merged

Add ModelTestUtils.h file to the installed headers #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d7de5b
Add ModelTestUtils.h file to the installed headers
GiulioRomualdi Dec 19, 2019
626632c
Update the changelog
GiulioRomualdi Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/releases/v0_12.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
8 changes: 3 additions & 5 deletions src/model/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}>"
Expand Down