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

Enable HIDE_SYMBOLS_BY_DEFAULT + linux patches #2248

Merged
merged 4 commits into from
Dec 18, 2023
+28 −4
Merged

Enable HIDE_SYMBOLS_BY_DEFAULT + linux patches #2248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7605a4
Added missing visible attributes
j-rivero Nov 3, 2023
f4ec310
Enable HIDE_SYMBOLS_BY_DEFAULT
j-rivero Nov 16, 2023
5bd0f73
Set custom plugin visibility definitions
j-rivero Dec 14, 2023
66cc09f
Make the linter happy
j-rivero Dec 14, 2023
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ set(GZ_SIM_GUI_PLUGIN_INSTALL_DIR
#============================================================================
# Configure the build
#============================================================================
gz_configure_build(QUIT_IF_BUILD_ERRORS)
gz_configure_build(QUIT_IF_BUILD_ERRORS
HIDE_SYMBOLS_BY_DEFAULT)

add_subdirectory(examples)

Expand Down
17 changes: 15 additions & 2 deletions src/gui/plugins/joint_position_controller/JointPositionController.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@
#include <gz/sim/gui/GuiSystem.hh>
#include <gz/sim/Types.hh>

#ifndef _WIN32
# define JointPositionController_EXPORTS_API \
__attribute__ ((visibility ("default")))
#else
# if (defined(JointPositionController_EXPORTS))
# define JointPositionController_EXPORTS_API __declspec(dllexport)
# else
# define JointPositionController_EXPORTS_API __declspec(dllimport)
# endif
#endif

Q_DECLARE_METATYPE(gz::sim::Entity)

namespace gz
Expand All @@ -36,7 +47,8 @@ namespace gui
class JointPositionControllerPrivate;

/// \brief Model holding information about joints
class JointsModel : public QStandardItemModel
class JointPositionController_EXPORTS_API JointsModel :
public QStandardItemModel
{
Q_OBJECT

Expand Down Expand Up @@ -88,7 +100,8 @@ namespace gui
/// `<model_name>`: Load the widget pointed at the given model, so it's not
/// necessary to select it. If a model is given at startup, the plugin starts
/// in locked mode.
class JointPositionController : public sim::GuiSystem
class JointPositionController_EXPORTS_API JointPositionController :
public sim::GuiSystem
{
Q_OBJECT

Expand Down
12 changes: 11 additions & 1 deletion src/gui/plugins/plot_3d/Plot3D.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@

#include "gz/gui/qt.h"

#ifndef _WIN32
# define Plot3D_EXPORTS_API __attribute__ ((visibility ("default")))
#else
# if (defined(Plot3D_EXPORTS))
# define Plot3D_EXPORTS_API __declspec(dllexport)
# else
# define Plot3D_EXPORTS_API __declspec(dllimport)
# endif
#endif

namespace gz
{
namespace sim
Expand Down Expand Up @@ -59,7 +69,7 @@ namespace gui
/// After this number is reached, the older points start being deleted.
/// Defaults to 1000.
///
class Plot3D : public gz::sim::GuiSystem
class Plot3D_EXPORTS_API Plot3D : public gz::sim::GuiSystem
{
Q_OBJECT

Expand Down
Loading