From 84de80e9cb57ceca8a9d4225920307cca4729c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?=
<30413512+eclipseo@users.noreply.github.com>
Date: Sun, 15 Oct 2023 10:52:28 +0200
Subject: [PATCH] Fix missing QTSINGLECOREAPPLICATION_LIBRARIES
In f3837f95db61a8d79c40c8da8467c7e502fc2156, QTSINGLECOREAPPLICATION_LIBRARIES was mistakenly removed, which prevents building with USE_SYSTEM_QTSINGLEAPPLICATION enabled.
---
.github/workflows/all.yml | 3 +++
CMakeLists.txt | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index ac90d1f23..074657546 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -232,6 +232,7 @@ jobs:
qt5-qtx11extras-devel
qt5-rpm-macros
qtsingleapplication-qt5-devel
+ qtsinglecoreapplication-qt5-devel
rpmdevtools
sha2-devel
sparsehash-devel
@@ -305,6 +306,7 @@ jobs:
qt5-qtx11extras-devel
qt5-rpm-macros
qtsingleapplication-qt5-devel
+ qtsinglecoreapplication-qt5-devel
rpmdevtools
sha2-devel
sparsehash-devel
@@ -378,6 +380,7 @@ jobs:
qt5-qtx11extras-devel
qt5-rpm-macros
qtsingleapplication-qt5-devel
+ qtsinglecoreapplication-qt5-devel
rpmdevtools
sha2-devel
sparsehash-devel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b162c7f33..806d7ff8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,6 +354,11 @@ if(USE_SYSTEM_QTSINGLEAPPLICATION)
add_library(qtsingleapplication INTERFACE)
target_link_libraries(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_LIBRARIES)
target_include_directories(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_INCLUDE_DIRS)
+ find_path(QTSINGLECOREAPPLICATION_INCLUDE_DIRS qtsinglecoreapplication.h PATH_SUFFIXES qt5/QtSolutions REQUIRED)
+ find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6 REQUIRED)
+ add_library(qtsinglecoreapplication INTERFACE)
+ target_link_libraries(qtsinglecoreapplication INTERFACE QTSINGLECOREAPPLICATION_LIBRARIES)
+ target_include_directories(qtsinglecoreapplication INTERFACE QTSINGLECOREAPPLICATION_INCLUDE_DIRS)
else(USE_SYSTEM_QTSINGLEAPPLICATION)
add_subdirectory(3rdparty/qtsingleapplication)
set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication)
--
2.41.0