build: Remove FTGL / Freetype from OSX build

.github/workflows/_build_and_package.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "${{ inputs.osxRunner }}", windows-2022 ]
+        os: [ "${{ inputs.osxRunner }}" ]
     runs-on: ${{ matrix.os }}
     steps:
     - name: 'Download Source Tarfiles'
@@ -58,29 +58,3 @@ jobs:
         conanHash: ${{ inputs.conanHash }}
         osxTargetDeploymentVersion: ${{ inputs.osxTargetDeploymentVersion }}
 
-  BuildLinux:
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [ dissolve, dissolve-gui ]
-    runs-on: ubuntu-latest
-    steps:
-    - name: 'Download Source Tarfiles'
-      uses: actions/download-artifact@v4
-      with:
-        name: source
-
-    - name: 'Unpack Source'
-      shell: bash
-      run: tar -xvf dissolve-versioned-source.tar
-
-    - name: "Build, Test, Package (Linux, ${{ matrix.target }})"
-      uses: "./.github/workflows/build"
-      with:
-        target: ${{ matrix.target }}
-        currentVersion: ${{ inputs.currentVersion }}
-        nixHash: ${{ inputs.nixHash }}
-        benchmark: ${{ inputs.benchmark }}
-        publishBenchmarks: ${{ inputs.publishBenchmarks }}
-        osxTargetDeploymentVersion: ${{ inputs.osxTargetDeploymentVersion }}
-

.github/workflows/build/osx/action.yml

@@ -6,10 +6,6 @@ inputs:
     default: true
   osxTargetDeploymentVersion:
     default: 13.3
-  freeTypeArchive:
-    default: https://download.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.gz
-  ftglRepo:
-    default: https://github.com/disorderedmaterials/ftgl-2.4.0
   cacheOnly:
     type: boolean
     default: false
@@ -37,7 +33,6 @@ runs:
       set -ex
       brew update-reset
       brew install gsl
-      brew uninstall --ignore-dependencies freetype
 
   - name: Get ANTLR
     working-directory: ${{ runner.temp }}
@@ -57,74 +52,6 @@ runs:
       export PATH="$(python3 -m site --user-base)/bin:$PATH"
       aqt install-qt --outputdir ${{ runner.temp }}/qt mac desktop ${{ inputs.qtVersion }} -m all
 
-  #
-  # Build / Retrieve Freetype
-  #
-
-  - name: Retrieve FreeType Cache
-    id: cache-freetype
-    uses: actions/cache@v4
-    with:
-      key: osx-freetype
-      path: |
-        ${{ runner.temp }}/freetype-latest
-        ${{ runner.temp }}/freetype-install
-
-  - name: Download FreeType
-    if: ${{ steps.cache-freetype.outputs.cache-hit != 'true' }}
-    working-directory: ${{ runner.temp }}
-    shell: bash
-    run: |
-      set -ex
-      wget ${{ inputs.freeTypeArchive }} -Ofreetype.tgz
-      tar -zxvf freetype.tgz
-      rm freetype.tgz
-      mv freetype-* freetype-latest
-
-  - name: Build FreeType
-    if: ${{ steps.cache-freetype.outputs.cache-hit != 'true' }}
-    working-directory: ${{ runner.temp }}
-    shell: bash
-    run: |
-      set -ex
-      mkdir freetype-build && cd freetype-build
-      cmake ../freetype-latest -G Ninja -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz:bool=true -DCMAKE_DISABLE_FIND_PACKAGE_BZip2:bool=true -DCMAKE_DISABLE_FIND_PACKAGE_PNG:bool=true -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB:bool=true -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec:bool=true -DCMAKE_INSTALL_PREFIX:path=../freetype-install -DBUILD_SHARED_LIBS:bool=OFF  -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ inputs.osxTargetDeploymentVersion }}
-      cmake --build . --target install --config Release
-
-  #
-  # Build / Retrieve FTGL
-  #
-
-  - name: Retrieve FTGL Cache
-    id: cache-ftgl
-    uses: actions/cache@v4
-    with:
-      key: osx-ftgl
-      path: |
-        ${{ runner.temp }}/ftgl-latest
-        ${{ runner.temp }}/ftgl-install
-
-  - name: Download FTGL
-    if: ${{ steps.cache-ftgl.outputs.cache-hit != 'true' }}
-    working-directory: ${{ runner.temp }}
-    shell: bash
-    run: |
-      set -ex
-      git clone ${{ inputs.ftglRepo }} ftgl-latest
-
-  - name: Build FTGL
-    if: ${{ steps.cache-ftgl.outputs.cache-hit != 'true' }}
-    working-directory: ${{ runner.temp }}
-    shell: bash
-    run: |
-      set -ex
-      mkdir ftgl-build && cd ftgl-build
-      INCLUDE="${RUNNER_TEMP}/freetype-latest;$INCLUDE"
-      LIB="${RUNNER_TEMP}/freetype-install/lib;${RUNNER_TEMP}/freetype-install/bin;$LIB"
-      export FREETYPE_DIR="${RUNNER_TEMP}/freetype-install"
-      cmake ../ftgl-latest -G Ninja -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_INSTALL_PREFIX:path=../ftgl-install -DBUILD_SHARED_LIBS:bool=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ inputs.osxTargetDeploymentVersion }}
-      cmake --build . --target install --config Release
-
   #
   # Main Build
   #
@@ -155,8 +82,6 @@ runs:
       export PATH="$(python3 -m site --user-base)/bin:$PATH"
       Qt6_DIR=${{ runner.temp }}/qt/${{ inputs.qtVersion }}/macos/lib/cmake/Qt6
       QT_BASE_DIR=${{ runner.temp }}/qt/${{ inputs.qtVersion }}/macos
-      export FTGL_DIR="${RUNNER_TEMP}/ftgl-install"
-      export FREETYPE_DIR="${RUNNER_TEMP}/freetype-install"
 
       # Find ANTLR4
       ANTLR_EXE="${{ runner.temp }}/antlr-${{ inputs.antlrVersion }}-complete.jar"

CMakeLists.txt

@@ -108,9 +108,6 @@ if(MULTI_THREADING)
 endif(MULTI_THREADING)
 
 if(GUI)
-  find_package(Freetype REQUIRED)
-  find_package(FTGL REQUIRED)
-
   list(APPEND CMAKE_PREFIX_PATH "${QT_BASE_DIR}")
   find_package(OpenGL REQUIRED)
   find_package(
@@ -153,11 +150,6 @@ if(WIN32)
   set(gui_target_name Dissolve-GUI)
   set(qmlgui_target_name Dissolve-GUI-QML)
 
-  # Adjust external include directories for GUI
-  if(GUI)
-    include_directories(${FTGL_INCLUDE_DIRS})
-  endif(GUI)
-
   # Format requires on MSVC std:c++latest, so we have to ask for C++23, despite the fact it's part of the C++20 standard.
   set(CMAKE_CXX_STANDARD 23)
 
@@ -195,15 +187,6 @@ if(APPLE)
   set(qmlgui_target_name dissolve-gui-qml)
 
   add_definitions(-D_MAC)
-
-  if(GUI)
-    # Find GLUT
-    find_package(GLUT REQUIRED)
-
-    # Adjust external include directories for GUI
-    include_directories(${FTGL_INCLUDE_DIRS})
-    include_directories(${FREETYPE_INCLUDE_DIRS})
-  endif(GUI)
 endif(APPLE)
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})