From 16f07ff0c3be0f928fe0c4a22ebbcba637d2816a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane?= <contact@slepin.fr>
Date: Thu, 20 Apr 2017 13:58:31 +0200
Subject: [PATCH] Travis OS X Packaging: include QtWebSockets in pkg

---
 CI/build-osx.sh              |  5 +----
 CI/osx/obs-websocket.pkgproj | 33 +++++++++++++++++++++++++++++++++
 CI/package-osx.sh            |  3 +++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/CI/build-osx.sh b/CI/build-osx.sh
index 6e40ee54..fa80b90f 100755
--- a/CI/build-osx.sh
+++ b/CI/build-osx.sh
@@ -4,10 +4,7 @@ set -ex
 mkdir build && cd build
 
 cmake .. \
-  -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake \
-  -DQt5Core_DIR=$(brew --prefix qt5)/lib/cmake/Qt5Core \
-  -DQt5Widgets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5Widgets \
-  -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets \
+  -DQTDIR=$(brew --prefix qt5) \
   -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
   -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
   -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/CI/osx/obs-websocket.pkgproj b/CI/osx/obs-websocket.pkgproj
index 2deecbee..d7279ee9 100644
--- a/CI/osx/obs-websocket.pkgproj
+++ b/CI/osx/obs-websocket.pkgproj
@@ -24,6 +24,39 @@
 											<dict>
 												<key>CHILDREN</key>
 												<array>
+													<dict>
+														<key>CHILDREN</key>
+														<array>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>80</integer>
+																<key>PATH</key>
+																<string>../../release/QtWebSockets</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>292</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+														</array>
+														<key>GID</key>
+														<integer>80</integer>
+														<key>PATH</key>
+														<string>bin</string>
+														<key>PATH_TYPE</key>
+														<integer>0</integer>
+														<key>PERMISSIONS</key>
+														<integer>509</integer>
+														<key>TYPE</key>
+														<integer>2</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
 													<dict>
 														<key>CHILDREN</key>
 														<array>
diff --git a/CI/package-osx.sh b/CI/package-osx.sh
index 2de58aa2..fd19192f 100755
--- a/CI/package-osx.sh
+++ b/CI/package-osx.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+export WS_LIB="$(brew --prefix qt5)/lib/QtWebSockets.framework/QtWebSockets"
+
 export GIT_HASH=$(git rev-parse --short HEAD)
 
 export VERSION="$GIT_HASH-$TRAVIS_BRANCH"
@@ -12,6 +14,7 @@ fi
 export FILENAME="obs-websocket-$VERSION-osx.pkg"
 
 mkdir release
+cp $WS_LIB ./release
 
 packagesbuild ./CI/osx/obs-websocket.pkgproj