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 25
25
echo " USING PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} "
26
26
27
27
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
+
28
36
export ROS_PYTHON_VERSION=` $PYTHON_EXECUTABLE -c " import sys; print('%i.%i' % (sys.version_info[0:2]))" `
29
37
echo " Using Python $ROS_PYTHON_VERSION "
30
38
@@ -50,6 +58,7 @@ cmake ${CMAKE_ARGS} .. -DCMAKE_INSTALL_PREFIX=$PREFIX \
50
58
-DCMAKE_FIND_FRAMEWORK=LAST \
51
59
-DBUILD_SHARED_LIBS=ON \
52
60
-DPYTHON_EXECUTABLE=$PYTHON_EXECUTABLE \
61
+ -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE \
53
62
-DSETUPTOOLS_DEB_LAYOUT=OFF \
54
63
-DCATKIN_SKIP_TESTING=$SKIP_TESTING \
55
64
-DCATKIN_BUILD_BINARY_PACKAGE=$CATKIN_BUILD_BINARY_PACKAGE \
You can’t perform that action at this time.
0 commit comments