Update scripts

trackpoint-app/build-dependencies-first.sh

@@ -12,5 +12,4 @@ thirdparty/qt.sh $OPTIONS
 if [ $OPTIONS == "release" ]; then
   thirdparty/openscenegraph.sh release
   thirdparty/lib3mf.sh release
-  thirdparty/json.sh release
 fi

trackpoint-app/thirdparty/json.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-# Build Json
-
-set -e
-
-if [ $1 == "release" ]; then
-  BASEDIR=$PWD/thirdparty/json-static
-  OPTIONS="-DBUILD_SHARED_LIBS:BOOL=OFF"
-else
-  BASEDIR=$PWD/thirdparty/json
-  OPTIONS=""
-fi
-
-DEPLOYDIR=$BASEDIR/install
-
-JSON_TAG="v3.9.1"
-
-JSON_REPO="https://github.com/nlohmann/json"
-
-CONFIG="-DJSON_BuildTests:BOOL=OFF"
-
-mkdir -p $BASEDIR
-
-if [ -d $DEPLOYDIR ]; then
-  rm -rf $DEPLOYDIR
-fi
-mkdir -p $DEPLOYDIR
-
-pushd $BASEDIR
-
-if [ -d "json" ]; then
-  rm -rf "json"
-fi
-
-git clone --depth 1 --branch $JSON_TAG $JSON_REPO
-pushd json
-
-cmake . -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR $CONFIG $OPTIONS
-cmake --build . --parallel
-cmake --install .
-
-popd

trackpoint-app/thirdparty/lib3mf.sh

@@ -4,13 +4,12 @@
 set -e
 
 if [ $1 == "release" ]; then
-  BASEDIR=$PWD/thirdparty/lib3mf-static
   OPTIONS="-DBUILD_SHARED_LIBS:BOOL=OFF"
 else
-  BASEDIR=$PWD/thirdparty/lib3mf
   OPTIONS=""
 fi
 
+BASEDIR=$PWD/thirdparty/lib3mf
 DEPLOYDIR=$BASEDIR/install
 
 LIB3MF_TAG="v2.1.1"

trackpoint-app/thirdparty/openscenegraph.sh

@@ -4,16 +4,15 @@
 set -e
 
 if [ $1 == "release" ]; then
-  BASEDIR=$PWD/thirdparty/openscenegraph-static
   OPTIONS="-DDYNAMIC_OPENSCENEGRAPH:BOOL=OFF -DDYNAMIC_OPENTHREADS:BOOL=OFF -DOSG_GL_LIBRARY_STATIC:BOOL=ON"
 else
-  BASEDIR=$PWD/thirdparty/openscenegraph
   OPTIONS=""
 fi
 
 CORES=$(getconf _NPROCESSORS_ONLN)
 JOBS=$(($CORES-1))
 
+BASEDIR=$PWD/thirdparty/openscenegraph
 DEPLOYDIR=$BASEDIR/install
 
 OPENSCENEGRAPH_TAG="OpenSceneGraph-3.6.5"

trackpoint-app/thirdparty/qt.sh

@@ -4,13 +4,12 @@
 set -e
 
 if [ $1 == "release" ]; then
-  BASEDIR=$PWD/thirdparty/qt-static
   OPTIONS="-static"
 else
-  BASEDIR=$PWD/thirdparty/qt
   OPTIONS=""
 fi
 
+BASEDIR=$PWD/thirdparty/qt
 DEPLOYDIR=$BASEDIR/install
 
 QT_MAJOR=6