[PATCH 1/1] Adapt build.sh if qmake is already in PATH on a Mac

[Thiago Macieira]

Some people (like me) have Qt elsewhere. So long as qmake is in PATH,
we should be able to support it.

Signed-off-by: Thiago Macieira 
---
 scripts/build.sh | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 1e64b515..88437c76 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -174,7 +174,11 @@ if [ $BUILDMARBLE = 1 ]; then
mkdir -p build
cd build
if [ $PLATFORM = Darwin ] ; then
-   if [ -d "$HOME/Qt/5.8" ] ; then
+   # qmake in PATH?
+   libdir=`qmake -query QT_INSTALL_LIBS`
+   if [ $? -eq 0 ]; then
+   export CMAKE_PREFIX_PATH=$libdir/cmake
+   elif [ -d "$HOME/Qt/5.8" ] ; then
export CMAKE_PREFIX_PATH=~/Qt/5.8/clang_64/lib/cmake
elif [ -d "$HOME/Qt/5.7" ] ; then
export CMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/lib/cmake
-- 
2.12.2

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: [PATCH] Visualisation of individual oxygen sensor data for CCR dives

[Davide DB]

On 17 May 2017 at 21:56, Davide DB  wrote:
> I uploaded a zip containing 54 eccr dives obtained via dctool from a
> JJ Petrel controller.
>
> https://drive.google.com/open?id=0B1RlIJJRLXsHX3JrcXllUXhDTmM
>
> All dives use 0,7 and 1,2 as setpoints.


Another batch of 24 eccr dives coming from a different JJ Petrel 2
divecan controller.
This time all of them have set-points at 0,7 and 1,3.

https://drive.google.com/open?id=0B1RlIJJRLXsHeWNoc09GT01EQWc

Bye

--
Davide
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface