File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change 2525echo " USING PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} "
2626
2727
28+ if [[ " $CONDA_BUILD_CROSS_COMPILATION " != " 1" ]]; then
29+ PKG_CONFIG_EXECUTABLE=$PREFIX /bin/pkg-config
30+ else
31+ PKG_CONFIG_EXECUTABLE=$BUILD_PREFIX /bin/pkg-config
32+ fi
33+ echo " USING PKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE} "
34+
35+
2836export ROS_PYTHON_VERSION=` $PYTHON_EXECUTABLE -c " import sys; print('%i.%i' % (sys.version_info[0:2]))" `
2937echo " Using Python $ROS_PYTHON_VERSION "
3038
@@ -50,6 +58,7 @@ cmake ${CMAKE_ARGS} .. -DCMAKE_INSTALL_PREFIX=$PREFIX \
5058 -DCMAKE_FIND_FRAMEWORK=LAST \
5159 -DBUILD_SHARED_LIBS=ON \
5260 -DPYTHON_EXECUTABLE=$PYTHON_EXECUTABLE \
61+ -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE \
5362 -DSETUPTOOLS_DEB_LAYOUT=OFF \
5463 -DCATKIN_SKIP_TESTING=$SKIP_TESTING \
5564 -DCATKIN_BUILD_BINARY_PACKAGE=$CATKIN_BUILD_BINARY_PACKAGE \
You can’t perform that action at this time.
0 commit comments