Skip to content

Allows install paths with spaces on MacOS #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thp merged 2 commits into from
Feb 21, 2018
+21 −13
Merged

Allows install paths with spaces on MacOS #348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc6e154
Allows install paths to have spaces and sets up git submodules automa…
TimArt Feb 19, 2018
50f419e
Removes unnecessary comments I added and adds corrections from shellc…
TimArt Feb 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions scripts/macos/build-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
#!/bin/bash -x -e
#!/bin/bash -xe
#
# Script to build Mac OS X binary snapshots of PS Move API
# Thomas Perl <m@thp.io>; 2012-09-28
#

# Determine PSMoveAPI root dir
export PSMOVEAPI_CHECKOUT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../"
PSMOVEAPI_CHECKOUT=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ && pwd )
export PSMOVEAPI_CHECKOUT

export OPENCV_CHECKOUT_DIR=$PSMOVEAPI_CHECKOUT/external/opencv
export OPENCV_BUILD_DIR=$PSMOVEAPI_CHECKOUT/external/opencv/build
export OPENCV_INSTALL_DIR=$OPENCV_CHECKOUT_DIR/build/install
export OPENCV_CHECKOUT_DIR="$PSMOVEAPI_CHECKOUT/external/opencv"
export OPENCV_BUILD_DIR="$PSMOVEAPI_CHECKOUT/external/opencv/build"
export OPENCV_INSTALL_DIR="$OPENCV_CHECKOUT_DIR/build/install"

# For parallel builds
MAKE_ARGS=-j4

# Enter PS Move API directory to call the following git commands in psmoveapi repository
cd "$PSMOVEAPI_CHECKOUT"

# Git revision identifier
PSMOVEAPI_REVISION=$(git describe --tags)
export PSMOVEAPI_REVISION

# Initialize Submodules of PS Move API
git submodule init
git submodule update

if [ ! -f $PSMOVEAPI_CHECKOUT/CMakeLists.txt ]; then
if [ ! -f "$PSMOVEAPI_CHECKOUT/CMakeLists.txt" ]; then
echo "ERROR: You have to run this script in the PS Move API source root."
exit 1
fi
Expand All @@ -26,7 +35,7 @@ fi
# needed for the PS3EYEDriver to access the PSEye
# otherwise we'd dynamically link against some the Homebrew libusb
(
cd $PSMOVEAPI_CHECKOUT/external/libusb-1.0
cd "$PSMOVEAPI_CHECKOUT/external/libusb-1.0"
export ARCHFLAGS='-arch x86_64'
export CFLAGS="$CFLAGS $ARCHFLAGS"
export CXXFLAGS="$CXXFLAGS $ARCHFLAGS"
Expand All @@ -35,10 +44,8 @@ fi
make ${MAKE_ARGS}
)

cd $PSMOVEAPI_CHECKOUT

# Build OpenCV
if [ ! -d $OPENCV_INSTALL_DIR ]; then
if [ ! -d "$OPENCV_INSTALL_DIR" ]; then
cd external
if [ ! -d opencv ]; then
git clone --depth 1 --branch 2.4 git://github.com/opencv/opencv.git
Expand Down Expand Up @@ -80,12 +87,13 @@ if [ ! -d $OPENCV_INSTALL_DIR ]; then
-DWITH_GSTREAMER=OFF \
-DWITH_GPHOTO2=OFF \
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
-DCMAKE_INSTALL_PREFIX=$(pwd)/install ..
-DCMAKE_INSTALL_PREFIX="$(pwd)/install" ..
make ${MAKE_ARGS}
make install
fi

cd $PSMOVEAPI_CHECKOUT
# Enter PS Move API directory to build
cd "$PSMOVEAPI_CHECKOUT"

# Build PS Move API
rm -rf build
Expand All @@ -95,5 +103,5 @@ cmake -DPSMOVE_USE_PS3EYE_DRIVER=ON \
-DPSMOVE_BUILD_TRACKER=ON \
-DPSMOVE_BUILD_JAVA_BINDINGS=ON \
-DPSMOVE_BUILD_PROCESSING_BINDINGS=ON \
-DOpenCV_DIR=${OPENCV_BUILD_DIR} ..
-DOpenCV_DIR="${OPENCV_BUILD_DIR}" ..
make ${MAKE_ARGS}