@@ -40,7 +40,7 @@ find_package(tesseract_kinematics REQUIRED)
40
40
# find_package(TinyXML2 REQUIRED)
41
41
# find_package(opw_kinematics REQUIRED)
42
42
43
- find_package (tesseract_task_composer REQUIRED )
43
+ find_package (tesseract_task_composer REQUIRED COMPONENTS core planning taskflow )
44
44
45
45
if (NOT TinyXML2_INCLUDE_DIRS AND TARGET tinyxml2::tinyxml2 )
46
46
get_target_property (TinyXML2_INCLUDE_DIRS tinyxml2::tinyxml2 INTERFACE_INCLUDE_DIRECTORIES )
@@ -49,6 +49,8 @@ endif()
49
49
50
50
tesseract_variables ()
51
51
52
+ find_bullet ()
53
+
52
54
include_directories (
53
55
${trajopt_INCLUDE_DIRS}
54
56
${tesseract_common_INCLUDE_DIRS}
@@ -87,19 +89,29 @@ message(STATUS "Building Python Version: " ${PYTHON_VERSION_MAJOR})
87
89
88
90
# Find NumPy
89
91
find_path (NUMPY_INCLUDE_NDARRAYOBJECT_DIR numpy/ndarrayobject.h PATHS ${PYTHON_INCLUDE_DIRS} NO_DEFAULT_PATH )
90
- if (NUMPY_INCLUDE_NDARRAYOBJECT_DIR )
91
- set (NUMPY_INCLUDE_DIR ${NUMPY_INCLUDE_NDARRAYOBJECT_DIR} )
92
+ if (NUMPY_INCLUDE_NDARRAYOBJECT_DIR )
93
+ set (NUMPY_INCLUDE_DIR ${NUMPY_INCLUDE_NDARRAYOBJECT_DIR} )
92
94
else ()
93
- execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; import os; print(os.path.dirname(numpy.__file__) + '/core/include')" RESULT_VARIABLE FIND_NUMPY_RESULT OUTPUT_VARIABLE NUMPY_INCLUDE_DIR )
94
- string (STRIP "${NUMPY_INCLUDE_DIR} " NUMPY_INCLUDE_DIR )
95
+ execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; import os; print(os.path.dirname(numpy.__file__))"
96
+ RESULT_VARIABLE FIND_NUMPY_RESULT OUTPUT_VARIABLE NUMPY_INCLUDE_DIR1 )
97
+ string (STRIP "${NUMPY_INCLUDE_DIR1} " NUMPY_INCLUDE_DIR1 )
98
+
99
+ if (${FIND_NUMPY_RESULT} )
100
+ message (FATAL_ERROR "Could not determine NumPy include directory" )
101
+ endif ()
102
+
103
+ if (EXISTS "${NUMPY_INCLUDE_DIR1} /core/include/numpy/ndarrayobject.h" )
104
+ set (NUMPY_INCLUDE_DIR "${NUMPY_INCLUDE_DIR1} /core/include" )
105
+ else ()
106
+ if (EXISTS "${NUMPY_INCLUDE_DIR1} /_core/include/numpy/ndarrayobject.h" )
107
+ set (NUMPY_INCLUDE_DIR "${NUMPY_INCLUDE_DIR1} /_core/include" )
108
+ endif ()
109
+ endif ()
95
110
96
- if (${FIND_NUMPY_RESULT} )
97
- message (FATAL_ERROR "Could not determine NumPy include directory" )
98
- endif ()
99
111
endif ()
100
112
101
- if (NOT EXISTS "${NUMPY_INCLUDE_DIR} /numpy/ndarrayobject.h" )
102
- message (FATAL_ERROR "Could not find numpy/ndarrayobject.h include file" )
113
+ if (NOT EXISTS "${NUMPY_INCLUDE_DIR} /numpy/ndarrayobject.h" )
114
+ message (FATAL_ERROR "Could not find numpy/ndarrayobject.h include file" )
103
115
endif ()
104
116
105
117
message (STATUS "NumPy Include Directory: ${NUMPY_INCLUDE_DIR} " )
@@ -122,12 +134,12 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/tesseract_python_module.cmake)
122
134
123
135
tesseract_python_module (tesseract_common_python SWIG_SRCS swig/tesseract_common_python.i PACKAGE tesseract_common LIBS tesseract::tesseract_common )
124
136
tesseract_python_module (tesseract_geometry_python SWIG_SRCS swig/tesseract_geometry_python.i PACKAGE tesseract_geometry LIBS tesseract::tesseract_geometry )
125
- tesseract_python_module (tesseract_collision_python SWIG_SRCS swig/tesseract_collision_python.i PACKAGE tesseract_collision LIBS tesseract::tesseract_collision_core tesseract::tesseract_collision_bullet_factories tesseract::tesseract_collision_fcl_factories )
137
+ tesseract_python_module (tesseract_collision_python SWIG_SRCS swig/tesseract_collision_python.i PACKAGE tesseract_collision LIBS tesseract::tesseract_collision_core Bullet3::Bullet ) # tesseract::tesseract_collision_bullet_factories tesseract::tesseract_collision_fcl_factories )
126
138
tesseract_python_module (tesseract_scene_graph_python SWIG_SRCS swig/tesseract_scene_graph_python.i PACKAGE tesseract_scene_graph LIBS tesseract::tesseract_scene_graph )
127
139
tesseract_python_module (tesseract_srdf_python SWIG_SRCS swig/tesseract_srdf_python.i PACKAGE tesseract_srdf LIBS tesseract::tesseract_srdf )
128
140
tesseract_python_module (tesseract_urdf_python SWIG_SRCS swig/tesseract_urdf_python.i PACKAGE tesseract_urdf LIBS tesseract::tesseract_urdf )
129
141
tesseract_python_module (tesseract_state_solver_python SWIG_SRCS swig/tesseract_state_solver_python.i PACKAGE tesseract_state_solver LIBS tesseract::tesseract_state_solver_core tesseract::tesseract_state_solver_ofkt tesseract::tesseract_state_solver_kdl )
130
- tesseract_python_module (tesseract_kinematics_python SWIG_SRCS swig/tesseract_kinematics_python.i PACKAGE tesseract_kinematics LIBS tesseract::tesseract_kinematics_kdl_factories tesseract::tesseract_kinematics_ur_factory tesseract::tesseract_kinematics_opw_factory tesseract::tesseract_kinematics_core_factories tesseract::tesseract_kinematics_core )
142
+ tesseract_python_module (tesseract_kinematics_python SWIG_SRCS swig/tesseract_kinematics_python.i PACKAGE tesseract_kinematics LIBS tesseract::tesseract_kinematics_core ) # tesseract::tesseract_kinematics_kdl_factories tesseract::tesseract_kinematics_ur_factory tesseract::tesseract_kinematics_opw_factory tesseract::tesseract_kinematics_core_factories )
131
143
tesseract_python_module (tesseract_environment_python SWIG_SRCS swig/tesseract_environment_python.i PACKAGE tesseract_environment LIBS tesseract::tesseract_environment )
132
144
tesseract_python_module (tesseract_visualization_python SWIG_SRCS swig/tesseract_visualization_python.i PACKAGE tesseract_visualization LIBS tesseract::tesseract_visualization )
133
145
tesseract_python_module (tesseract_command_language_python SWIG_SRCS swig/tesseract_command_language_python.i PACKAGE tesseract_command_language LIBS tesseract::tesseract_command_language )
@@ -137,7 +149,7 @@ tesseract_python_module(tesseract_motion_planners_trajopt_python SWIG_SRCS swig/
137
149
tesseract_python_module (tesseract_motion_planners_ompl_python SWIG_SRCS swig/tesseract_motion_planners_ompl_python.i PACKAGE tesseract_motion_planners_ompl LIBS tesseract::tesseract_motion_planners_ompl )
138
150
tesseract_python_module (tesseract_motion_planners_descartes_python SWIG_SRCS swig/tesseract_motion_planners_descartes_python.i PACKAGE tesseract_motion_planners_descartes LIBS tesseract::tesseract_motion_planners_descartes )
139
151
tesseract_python_module (tesseract_time_parameterization_python SWIG_SRCS swig/tesseract_time_parameterization_python.i PACKAGE tesseract_time_parameterization LIBS tesseract::tesseract_time_parameterization_core tesseract::tesseract_time_parameterization_isp tesseract::tesseract_time_parameterization_totg tesseract::tesseract_time_parameterization_ruckig )
140
- tesseract_python_module (tesseract_task_composer_python SWIG_SRCS swig/tesseract_task_composer_python.i PACKAGE tesseract_task_composer LIBS tesseract::tesseract_task_composer tesseract::tesseract_task_composer_nodes tesseract::tesseract_task_composer_taskflow tesseract::tesseract_task_composer_factories tesseract::tesseract_task_composer_planning_factories tesseract::tesseract_task_composer_planning tesseract::tesseract_task_composer_taskflow_factories )
152
+ # tesseract_python_module(tesseract_task_composer_python SWIG_SRCS swig/tesseract_task_composer_python.i PACKAGE tesseract_task_composer LIBS tesseract::tesseract_task_composer tesseract::tesseract_task_composer_nodes tesseract::tesseract_task_composer_taskflow ) # tesseract::tesseract_task_composer_factories tesseract::tesseract_task_composer_planning_factories tesseract::tesseract_task_composer_planning tesseract::tesseract_task_composer_taskflow_factories )
141
153
142
154
set (TESSERACT_PYTHON_MODULE_TARGETS
143
155
_tesseract_common_python
0 commit comments