Merge pull request #17 from ipa-nhg/test

Buildbot test
KCL-Planning · Apr 6, 2016 · 32ad5c2 · 32ad5c2
2 parents 988e8c5 + e4d29d9
commit 32ad5c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/rosplan_planning_system/CMakeLists.txt b/rosplan_planning_system/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(catkin REQUIRED COMPONENTS
 
 ## Declare things to be passed to dependent projects
 catkin_package(
-  INCLUDE_DIRS include
+  INCLUDE_DIRS include ${catkin_INCLUDE_DIRS} src/VALfiles
   LIBRARIES ${PROJECT_NAME}
   CATKIN_DEPENDS roscpp rospy std_msgs std_srvs diagnostic_msgs rosplan_dispatch_msgs rosplan_knowledge_msgs
   DEPENDS
@@ -28,11 +28,9 @@ catkin_package(
 ## Build ##
 ###########
 
-## include_directories(include)
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-  include
-)
+include_directories(include)
+include_directories(${catkin_INCLUDE_DIRS})
+include_directories(src/VALfiles)
 
 find_package(FLEX REQUIRED)
 
@@ -105,3 +103,8 @@ install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
   PATTERN ".svn" EXCLUDE
 )
+
+install(DIRECTORY src/VALfiles/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+  FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
+)
diff --git a/rosplan_planning_system/include/rosplan_planning_system/PlanningEnvironment.h b/rosplan_planning_system/include/rosplan_planning_system/PlanningEnvironment.h
@@ -6,7 +6,7 @@
 #include "ros/ros.h"
 #include "rosplan_knowledge_msgs/GetInstanceService.h"
 #include "rosplan_knowledge_msgs/GetAttributeService.h"
-#include "../../src/VALfiles/ptree.h"
+#include "ptree.h"
 #include "FlexLexer.h"
 #include <fstream>
 #include <sstream>