From 79f5f9fc35454929950b15bb5f07bbdaef57ffa6 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 24 Apr 2024 22:47:12 -0400 Subject: [PATCH] Try to avoid extra directory for plugins --- .github/workflows/cmake-multi-platform.yml | 2 +- launcher/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4efb3b6..1f79192 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -316,4 +316,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ runner.os }}-package - path: ${{ steps.strings.outputs.build-output-dir }}/bin + path: ${{ steps.strings.outputs.build-output-dir }}/bin/bin diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index ad2e122..82c23b3 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -27,7 +27,7 @@ endif() set(deploy_tool_options_arg "") if (WIN32) - set(deploy_tool_options_arg --no-quick-import --no-virtualkeyboard --no-opengl-sw) + set(deploy_tool_options_arg --no-quick-import --no-virtualkeyboard --no-opengl-sw --plugindir "${CMAKE_INSTALL_PREFIX}/bin/bin/plugins" --libdir "${CMAKE_INSTALL_PREFIX}/bin/bin/") endif() # We only need to call windeployqt on one executable