File tree Expand file tree Collapse file tree 3 files changed +9
-7
lines changed
include/behaviortree_cpp_v3 Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ if( ZMQ_FOUND )
38
38
message (STATUS "ZeroMQ found." )
39
39
add_definitions ( -DZMQ_FOUND )
40
40
list (APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp )
41
- list (APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES zmq )
41
+ list (APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES ${ZMQ_LIBRARIES} )
42
42
else ()
43
43
message (WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder]." )
44
44
endif ()
@@ -174,6 +174,10 @@ if (WIN32)
174
174
add_library (${BEHAVIOR_TREE_LIBRARY} STATIC ${BT_SOURCE} )
175
175
endif ()
176
176
177
+ if ( ZMQ_FOUND )
178
+ list (APPEND BUILD_TOOL_INCLUDE_DIRS ${ZMQ_INCLUDE_DIRS} )
179
+ endif ()
180
+
177
181
target_link_libraries (${BEHAVIOR_TREE_LIBRARY} PUBLIC
178
182
${BEHAVIOR_TREE_EXTERNAL_LIBRARIES} )
179
183
@@ -233,5 +237,3 @@ if( BUILD_EXAMPLES )
233
237
add_subdirectory (sample_nodes )
234
238
add_subdirectory (examples )
235
239
endif ()
236
-
237
-
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ See examples for more information about configuring CMake correctly
52
52
53
53
#else
54
54
55
- #ifdef __linux__
55
+ #if defined( __linux__) || defined __APPLE__
56
56
57
57
#define BT_REGISTER_NODES (factory ) \
58
58
extern " C" void __attribute__ ((visibility(" default" ))) \
Original file line number Diff line number Diff line change @@ -124,10 +124,10 @@ double convertFromString<double>(StringView str)
124
124
// see issue #120
125
125
// http://quick-bench.com/DWaXRWnxtxvwIMvZy2DxVPEKJnE
126
126
127
- const auto old_locale = std:: setlocale (LC_NUMERIC,nullptr );
128
- std:: setlocale (LC_NUMERIC," C" );
127
+ const auto old_locale = setlocale (LC_NUMERIC,nullptr );
128
+ setlocale (LC_NUMERIC," C" );
129
129
double val = std::stod (str.data ());
130
- std:: setlocale (LC_NUMERIC,old_locale);
130
+ setlocale (LC_NUMERIC,old_locale);
131
131
return val;
132
132
}
133
133
You can’t perform that action at this time.
0 commit comments