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

Fixes for Windows #143

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for Windows #143

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
a900ef1
Fix FindZMQ on Windows
Ace314159 Nov 16, 2021
4d826fd
Fix Windows build
Ace314159 Nov 16, 2021
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ add_library(behavior_tree_editor SHARED
${APP_CPPS}
${FORMS_HEADERS}
)
set_target_properties(behavior_tree_editor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
include(GenerateExportHeader)
generate_export_header(behavior_tree_editor)
target_include_directories(behavior_tree_editor PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
)

SET(GROOT_DEPENDENCIES QtNodeEditor )

Expand Down
4 changes: 3 additions & 1 deletion bt_editor/sidepanel_editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
#include <QTableWidgetItem>
#include "XML_utilities.hpp"

#include "behavior_tree_editor_export.h"

namespace Ui {
class SidepanelEditor;
}

class SidepanelEditor : public QFrame
class BEHAVIOR_TREE_EDITOR_EXPORT SidepanelEditor : public QFrame
{
Q_OBJECT

Expand Down
4 changes: 3 additions & 1 deletion bt_editor/sidepanel_replay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
#include <QStandardItemModel>
#include "bt_editor_base.h"

#include "behavior_tree_editor_export.h"


namespace Ui {
class SidepanelReplay;
}

class SidepanelReplay : public QFrame
class BEHAVIOR_TREE_EDITOR_EXPORT SidepanelReplay : public QFrame
{
Q_OBJECT

Expand Down
7 changes: 7 additions & 0 deletions cmake/FindZMQ.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#

find_package(ZeroMQ CONFIG REQUIRED)
if(TARGET libzmq)
add_library(zmq ALIAS libzmq)
set(ZMQ_FOUND TRUE)
return()
endif()

if (ZMQ_LIBRARIES AND ZMQ_INCLUDE_DIRS)
# in cache already
set(ZMQ_FOUND TRUE)
Expand Down