Fixing catkin build

Author: Davide Faconti

CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 project(behavior_tree_core)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -pthread -Werror=return-type")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}  "${CMAKE_CURRENT_LIST_DIR}/cmake")
 #############################################################
 # http://answers.ros.org/question/230877/optionally-build-a-package-with-catkin/
 #
@@ -93,12 +92,19 @@ else()
 endif()
 
 ######################################################
-# COMPILING LIBRARY
+# LIBRARY
 ######################################################
 add_library(behavior_tree_core STATIC ${BT_Source} )
 target_compile_options(behavior_tree_core PRIVATE "-fPIC")
 target_link_libraries(behavior_tree_core dl)
 
+######################################################
+# EXAMPLES and TOOLS
+######################################################
+
+add_subdirectory(tools)
+add_subdirectory(sample_nodes)
+add_subdirectory(examples)
 
 ######################################################
 # TESTS
@@ -134,23 +140,6 @@ elseif(GTEST_FOUND)
 
 endif()
 
-######################################################
-# COMPILING EXAMPLES and TOOLS
-######################################################
-
-add_executable(bt_log_cat         tools/bt_log_cat.cpp )
-target_link_libraries(bt_log_cat  ${BEHAVIOR_TREE_LIBRARIES} )
-
-if( ZMQ_FOUND )
-    add_executable(bt_recorder         tools/bt_recorder.cpp )
-    target_link_libraries(bt_recorder  ${BEHAVIOR_TREE_LIBRARIES} )
-endif()
-
-add_executable(bt_plugin_manifest         tools/bt_plugin_manifest.cpp )
-target_link_libraries(bt_plugin_manifest  ${BEHAVIOR_TREE_LIBRARIES} )
-
 
-add_subdirectory(sample_nodes)
-add_subdirectory(examples)
 
 

cmake/FindZMQ.cmake

@@ -25,7 +25,6 @@ else (ZMQ_LIBRARIES AND ZMQ_INCLUDE_DIRS)
       /usr/include
       /usr/local/include
       /opt/local/include
-      /sw/include
   )
 
   find_library(ZMQ_LIBRARY

examples/CMakeLists.txt

@@ -1,12 +1,4 @@
 cmake_minimum_required(VERSION 2.8)
-project(behavior_tree_core)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Werror=return-type")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 
 include_directories( ../include ../sample_nodes )
@@ -33,6 +25,5 @@ target_link_libraries(t03_sequence_star movebase_node dummy_nodes ${BEHAVIOR_TRE
 add_executable(t04_blackboard         t04_blackboard.cpp )
 target_link_libraries(t04_blackboard  movebase_node ${BEHAVIOR_TREE_LIBRARIES} )
 
-
 add_executable(t05_crossdoor         t05_crossdoor.cpp )
 target_link_libraries(t05_crossdoor  crossdoor_nodes ${BEHAVIOR_TREE_LIBRARIES} )

package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>behavior_tree_core</name>
-  <version>0.1.0</version>
+  <version>2.0.0</version>
   <description>
   This package provides a behavior trees core.
   </description>
@@ -11,6 +11,7 @@
   <license>MIT</license>
 
   <author>Michele Colledanchise</author>
+  <author>Davide Faconti</author>
 
   <buildtool_depend>catkin</buildtool_depend>
 

sample_nodes/CMakeLists.txt

@@ -1,11 +1,4 @@
 cmake_minimum_required(VERSION 2.8)
-project(behavior_tree_core)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Werror=return-type")
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 include_directories( ../include )
 

tools/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.8)
+
+include_directories( ../include )
+
+add_executable(bt_log_cat         bt_log_cat.cpp )
+target_link_libraries(bt_log_cat  ${BEHAVIOR_TREE_LIBRARIES} )
+
+if( ZMQ_FOUND )
+    add_executable(bt_recorder         bt_recorder.cpp )
+    target_link_libraries(bt_recorder  ${BEHAVIOR_TREE_LIBRARIES} )
+endif()
+
+add_executable(bt_plugin_manifest         bt_plugin_manifest.cpp )
+target_link_libraries(bt_plugin_manifest  ${BEHAVIOR_TREE_LIBRARIES} )