diff options
| author | Saturneric <[email protected]> | 2022-12-22 09:54:38 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-12-22 09:54:38 +0000 |
| commit | 6d9c71ac053406c988646080de44a52cf1bdd589 (patch) | |
| tree | 9098514dc6373c31c175da519aa45a7ce75f3288 | |
| parent | feat(translate): update translation files (diff) | |
| download | GpgFrontend-6d9c71ac053406c988646080de44a52cf1bdd589.tar.gz GpgFrontend-6d9c71ac053406c988646080de44a52cf1bdd589.zip | |
fix: solve ubuntu 18.04 build issues
| -rw-r--r-- | .github/workflows/release.yml | 21 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 |
2 files changed, 22 insertions, 3 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fadacde..9b9e8f82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: sudo apt-get update sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo sudo apt-get -y install gcc-8 g++-8 ninja-build - sudo apt-get -y install libconfig++-dev libboost-all-dev libarchive-dev libssl-dev + sudo apt-get -y install libconfig++-dev libarchive-dev libssl-dev sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0 @@ -57,6 +57,23 @@ jobs: sudo update-alternatives --set g++ "/usr/bin/g++-8" if: matrix.os == 'ubuntu-18.04' + - name: Install Boost (Linux) + uses: MarkusJx/[email protected] + id: install-boost + with: + # REQUIRED: Specify the required boost version + # A list of supported versions can be found here: + # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json + boost_version: 1.78.0 + # OPTIONAL: Specify a platform version + platform_version: 18.04 + # OPTIONAL: Specify an architecture + arch: x86 + + # NOTE: If a boost version matching all requirements cannot be found, + # this build step will fail + if: matrix.os == 'ubuntu-18.04' + - name: Codesign Configuration (macOS) run: | CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 @@ -147,7 +164,7 @@ jobs: - name: Build GpgFrontend (Linux) # Build your GpgFrontend with the given configuration run: | - cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBOOST_ROOT=${{steps.install-boost.outputs.BOOST_ROOT}} cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v if: matrix.os == 'ubuntu-18.04' diff --git a/CMakeLists.txt b/CMakeLists.txt index 60e2d688..81952f8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -447,7 +447,9 @@ SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DELPP_NO_DEFAULT_LOG_FILE") # Introduce boost -find_package(Boost COMPONENTS date_time system REQUIRED) +if(NOT BOOST_ROOT) + find_package(Boost COMPONENTS date_time system REQUIRED) +endif() # Introduce OpenSSL if(APPLE) |