Adjust Qt5 path detection.

disorderedmaterials · Mar 9, 2021 · 2054c98 · 2054c98
1 parent 200f712
commit 2054c98
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.azure-pipelines/templates/build-osx-serial-gui.yml b/.azure-pipelines/templates/build-osx-serial-gui.yml
@@ -17,13 +17,14 @@ steps:
     displayName: 'Install Conan'
   - bash: |
       set -ex
-      QTVER=`ls -d /usr/local/Cellar/qt/* | sed "s/.*\(5\.[0-9][0-9]\.[0-9]\)/\1/g"`
-      export Qt5_DIR=/usr/local/Cellar/qt/$QTVER/lib/cmake/Qt5
-      export Qt5Core_DIR=/usr/local/Cellar/qt/$QTVER/lib/cmake/Qt5Core
-      export Qt5Widgets_DIR=/usr/local/Cellar/qt/$QTVER/lib/cmake/Qt5Widgets
-      export Qt5PrintSupport_DIR=/usr/local/Cellar/qt/$QTVER/lib/cmake/Qt5PrintSupport
-      export Qt5Gui_DIR=/usr/local/Cellar/qt/$QTVER/lib/cmake/Qt5Gui
-      Qt5_ROOT=/usr/local/Cellar/qt/${QTVER}
+      QT_INSTALL_DIR=/usr/local/Cellar/qt@5
+      QTVER=`ls -d ${QT_INSTALL_DIR}/* | sed "s/.*\(5\.[0-9][0-9]\.[0-9]\)/\1/g"`
+      export Qt5_DIR=${QT_INSTALL_DIR}/$QTVER/lib/cmake/Qt5
+      export Qt5Core_DIR=${QT_INSTALL_DIR}/$QTVER/lib/cmake/Qt5Core
+      export Qt5Widgets_DIR=${QT_INSTALL_DIR}/$QTVER/lib/cmake/Qt5Widgets
+      export Qt5PrintSupport_DIR=${QT_INSTALL_DIR}/$QTVER/lib/cmake/Qt5PrintSupport
+      export Qt5Gui_DIR=${QT_INSTALL_DIR}/$QTVER/lib/cmake/Qt5Gui
+      Qt5_ROOT=${QT_INSTALL_DIR}/${QTVER}
       ANTLR_EXE=`find /usr/local/Cellar/antlr/4.9* -iname antlr`
       echo "Detected ANTLR exe as [$ANTLR_EXE]"
       mkdir build

diff --git a/.azure-pipelines/templates/package-osx-serial-gui.yml b/.azure-pipelines/templates/package-osx-serial-gui.yml
@@ -1,15 +1,13 @@
-parameters:
-  - name: qtver
-    default: 5.15.2
-
 steps:
   - bash: |
       pip3 install dmgbuild biplist
     displayName: 'Install Prerequisites'
   - bash: |
       set -ex
       # Set Qt dir - assume that it is somewhere in /usr/local/Cellar
-      Qt5_ROOT=/usr/local/Cellar/qt/${{ parameters.qtver }}
+      QT_INSTALL_DIR=/usr/local/Cellar/qt@5
+      QTVER=`ls -d ${QT_INSTALL_DIR}/* | sed "s/.*\(5\.[0-9][0-9]\.[0-9]\)/\1/g"`
+      Qt5_ROOT=${QT_INSTALL_DIR}/${QTVER}
       # Get program version
       DISSOLVE_VERSION=`grep "#define DISSOLVEVERSION" src/main/version.cpp | sed "s/.*\"\(.*\)\"/\1/g"`
       ci/scripts/prep-dmg -a Dissolve-GUI -v ${DISSOLVE_VERSION} -b build/bin/dissolve-gui.app/Contents/MacOS/dissolve-gui -d ${Qt5_ROOT} -i icon/icon-1024x1024.png -p build/bin/dissolve-gui.app/Contents/Info.plist