diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-04-19 09:59:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 09:59:11 +0200 |
| commit | f13c776099ff58951cbe0d26bfb230f82044a229 (patch) | |
| tree | 8b8a467ecf746543cd5ed1dce2ffefe1975c3f35 | |
| parent | fd7745cbebf55f5bcfccc16500fff0e67a789169 (diff) | |
| parent | 7b9d462fbcf1759b126a8852cd2070ac9afba471 (diff) | |
| download | PrismLauncher-f13c776099ff58951cbe0d26bfb230f82044a229.tar.gz PrismLauncher-f13c776099ff58951cbe0d26bfb230f82044a229.tar.bz2 PrismLauncher-f13c776099ff58951cbe0d26bfb230f82044a229.zip | |
Merge pull request #449 from DioEgizio/CI/specify-build-platform
specify -DLauncher_BUILD_PLATFORM on CI builds (EDIT: also remove "on x")
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rw-r--r-- | launcher/ui/MainWindow.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 196b6d79..c22baed3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,18 +104,18 @@ jobs: - name: Configure CMake (macOS) if: runner.os == 'macOS' run: | - cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DQt5_DIR=/usr/local/opt/qt@5 -DCMAKE_PREFIX_PATH=/usr/local/opt/qt@5 -G Ninja + cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DQt5_DIR=/usr/local/opt/qt@5 -DCMAKE_PREFIX_PATH=/usr/local/opt/qt@5 -DLauncher_BUILD_PLATFORM=macOS -G Ninja - name: Configure CMake (Windows) if: runner.os == 'Windows' shell: msys2 {0} run: | - cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -G Ninja + cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -G Ninja - name: Configure CMake (Linux) if: runner.os == 'Linux' run: | - cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -G Ninja + cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=Linux -G Ninja ## # BUILD diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 2b219aff..7ac4d2d4 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -831,10 +831,6 @@ public: void retranslateUi(QMainWindow *MainWindow) { QString winTitle = tr("%1 - Version %2", "Launcher - Version X").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString()); - if (!BuildConfig.BUILD_PLATFORM.isEmpty()) - { - winTitle += tr(" on %1", "on platform, as in operating system").arg(BuildConfig.BUILD_PLATFORM); - } MainWindow->setWindowTitle(winTitle); // all the actions for(auto * item: all_actions) |