Skip to content
Snippets Groups Projects
Commit f1a2aa1d authored by Nikolaus Vahrenkamp's avatar Nikolaus Vahrenkamp
Browse files

Merge branch 'master' of gitlab.com:Simox/simox

parents bfc9c98f 5e6e9ada
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 2
− 0
View file @ f1a2aa1d
......@@ -189,6 +189,8 @@ set(CPACK_COMPONENT_APPLICATIONDATA_DISPLAY_NAME "Simox Data")
set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Simox Libraries")
set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Simox C++ Headers")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libbullet-dev, libbulletmultithreaded2.82")
SET(CPACK_COMPONENTS_ALL Applications Headers Libraries ApplicationData)
INCLUDE(CPack)
......
VirtualRobot/Visualization/VisualizationFactory.h
+ 1
− 1
View file @ f1a2aa1d
......@@ -37,7 +37,7 @@ namespace VirtualRobot
{
class VisualizationNode;
class VIRTUAL_ROBOT_IMPORT_EXPORT VisualizationFactory : public AbstractFactoryMethod<VisualizationFactory, void*>
class VIRTUAL_ROBOT_IMPORT_EXPORT VisualizationFactory : public ::AbstractFactoryMethod<VisualizationFactory, void*>
{
public:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment