summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Lojewski <github@meklort.com>2020-09-12 10:12:57 -0600
committerGitHub <noreply@github.com>2020-09-12 10:12:57 -0600
commit0d07c0650f9ebb983a6a23b4a717ea3a695248cf (patch)
tree24448df5ecc8a4d15b3d6a6599810e14da2d0905
parentf062f1a81abe4ec11ceddb3c14d63ac341f603cc (diff)
downloadbcm5719-ortega-0d07c0650f9ebb983a6a23b4a717ea3a695248cf.tar.gz
bcm5719-ortega-0d07c0650f9ebb983a6a23b4a717ea3a695248cf.zip
build: Fix a packaging failure when the path has parens in it. (#103)
-rwxr-xr-xbuild.sh17
1 files changed, 16 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 8e41262..e2c24bd 100755
--- a/build.sh
+++ b/build.sh
@@ -61,6 +61,20 @@ then
fi
fi
+if [ ! -x "$CPACK" ]
+then
+ CPACK=`which cpack3`
+ if [ ! -x "$CPACK" ]
+ then
+ CPACK=`which cpack`
+ if [ ! -x "$CPACK" ]
+ then
+ echo "ERROR: Unable to locate cpack."
+ exit -1
+ fi
+ fi
+fi
+
NINJA=`which ninja-build`
if [ -x "$NINJA" ]
then
@@ -94,4 +108,5 @@ cd "$BUILD_DIR"
# Generate release packages.
"$CMAKE" --build . --target package
-"$CMAKE" --build . --target package_source
+# Work around an issue with --target package_source that fails due to ('s in the path
+"$CPACK" --config ./CPackSourceConfig.cmake
OpenPOWER on IntegriCloud