aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorNadia Holmquist Pedersen <nadia@nhp.sh>2022-05-21 19:54:55 +0200
committerGitHub <noreply@github.com>2022-05-21 19:54:55 +0200
commit94b33c924e0524452738e077aea03ba7e8b6302f (patch)
treead2750a5ed078ca15a3d2bc07b241db064ec26f4 /.github/workflows
parent6c7485d01786fe92da4c2760d23e4ee26ce872a3 (diff)
Modernize CMake build system (#1434)
These changes modernize the CMake build system to (hopefully) match newer best practices * Library linking is simpler and more automatic because of using imported targets * Multi-configuration builds should be supported (Ninja Multi-Config, Visual Studio, etc. generators) * Clean up build options using cmake_dependent_option * Let CMake do its job in more cases, like finding the math/dl libraries and detecting and enabling LTO support * Remove platform-specific kludges like the Fedora/flatpak LTO workaround and a bunch of Windows stuff * Simplify Windows static builds * Consistent formatting
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build-windows.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index a4026a7..bf44f6d 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -35,7 +35,7 @@ jobs:
- name: Configure
working-directory: ${{runner.workspace}}/build
- run: cmake $GITHUB_WORKSPACE -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DQT5_STATIC_DIR=C:/tools/msys64/mingw64/qt5-static
+ run: cmake $GITHUB_WORKSPACE -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH=C:/tools/msys64/mingw64/qt5-static
- name: Make
working-directory: ${{runner.workspace}}/build