Merge branch 'master' of https://github.com/BehaviorTree/BehaviorTree.CPP

daf@blue-ocean-robotics.com · daf@blue-ocean-robotics.com · commit aeb0d6416d3d · 2020-04-16T23:07:45.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.2) # version on Ubuntu Xenial
+cmake_minimum_required(VERSION 3.5.1) # version on Ubuntu Xenial
 project(behaviortree_cpp_v3)
 
 #---- Add the subdirectory cmake ----
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.2)
+cmake_minimum_required(VERSION 3.5.1)
 
 include_directories( ../sample_nodes )
 
diff --git a/include/behaviortree_cpp_v3/bt_factory.h b/include/behaviortree_cpp_v3/bt_factory.h
@@ -113,7 +113,7 @@ See examples for more information about configuring CMake correctly
 #elif _WIN32
 
 #define BT_REGISTER_NODES(factory)                                                                 \
-		__declspec(dllexport) void BT_RegisterNodesFromPlugin(BT::BehaviorTreeFactory& factory)
+    extern "C" void __declspec(dllexport) BT_RegisterNodesFromPlugin(BT::BehaviorTreeFactory& factory)
 #endif
 
 #endif
diff --git a/sample_nodes/CMakeLists.txt b/sample_nodes/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5.2)
+cmake_minimum_required(VERSION 3.5.1)
 
 include_directories( ../include )
 
@@ -36,4 +36,4 @@ target_compile_definitions(movebase_node_dyn PRIVATE  BT_PLUGIN_EXPORT )
 set_target_properties(movebase_node_dyn PROPERTIES LIBRARY_OUTPUT_DIRECTORY
     ${BEHAVIOR_TREE_BIN_DESTINATION} )
 
- 
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.5.2) # version on Ubuntu Xenial`
	`1`	`+cmake_minimum_required(VERSION 3.5.1) # version on Ubuntu Xenial`
`2`	`2`	`project(behaviortree_cpp_v3)`
`3`	`3`
`4`	`4`	`#---- Add the subdirectory cmake ----`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.5.2)`
	`1`	`+cmake_minimum_required(VERSION 3.5.1)`
`2`	`2`
`3`	`3`	`include_directories( ../sample_nodes )`
`4`	`4`