Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix missing QTSINGLECOREAPPLICATION_LIBRARIES

Browse Source 
In f3837f95db61a8d79c40c8da8467c7e502fc2156, QTSINGLECOREAPPLICATION_LIBRARIES was mistakenly removed, which prevents building with USE_SYSTEM_QTSINGLEAPPLICATION enabled.
This commit is contained in:
Robert-André Mauchin 2023-10-15 10:52:28 +02:00 committed by John Maguire
parent 4768cb9efb
commit 994d16effa
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/all.yml vendored
View File

@ -232,6 +232,7 @@ jobs:
qt5-qtx11extras-devel qt5-qtx11extras-devel
qt5-rpm-macros qt5-rpm-macros
qtsingleapplication-qt5-devel qtsingleapplication-qt5-devel
qtsinglecoreapplication-qt5-devel
rpmdevtools rpmdevtools
sha2-devel sha2-devel
sparsehash-devel sparsehash-devel
@ -305,6 +306,7 @@ jobs:
qt5-qtx11extras-devel qt5-qtx11extras-devel
qt5-rpm-macros qt5-rpm-macros
qtsingleapplication-qt5-devel qtsingleapplication-qt5-devel
qtsinglecoreapplication-qt5-devel
rpmdevtools rpmdevtools
sha2-devel sha2-devel
sparsehash-devel sparsehash-devel
@ -378,6 +380,7 @@ jobs:
qt5-qtx11extras-devel qt5-qtx11extras-devel
qt5-rpm-macros qt5-rpm-macros
qtsingleapplication-qt5-devel qtsingleapplication-qt5-devel
qtsinglecoreapplication-qt5-devel
rpmdevtools rpmdevtools
sha2-devel sha2-devel
sparsehash-devel sparsehash-devel

5
CMakeLists.txt
View File

@ -354,6 +354,11 @@ if(USE_SYSTEM_QTSINGLEAPPLICATION)
add_library(qtsingleapplication INTERFACE) add_library(qtsingleapplication INTERFACE)
target_link_libraries(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_LIBRARIES) target_link_libraries(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_LIBRARIES)
target_include_directories(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_INCLUDE_DIRS) 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) else(USE_SYSTEM_QTSINGLEAPPLICATION)
add_subdirectory(3rdparty/qtsingleapplication) add_subdirectory(3rdparty/qtsingleapplication)
set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication) set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication)