mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 08:22:33 +02:00
Merge commit '1bc9701979ec872620776debafeffa1922572938' into 172-add-wayland-layer-shell-support
This commit is contained in:
commit
0596499e8e
1
.gitignore
vendored
1
.gitignore
vendored
@ -261,3 +261,4 @@ cython_debug/
|
|||||||
/ThirdParty/qml-archive/**
|
/ThirdParty/qml-archive/**
|
||||||
/ThirdParty/qml-plausible/
|
/ThirdParty/qml-plausible/
|
||||||
/ThirdParty/ffmpeg/**
|
/ThirdParty/ffmpeg/**
|
||||||
|
/ThirdParty/qt-layer-shell/**
|
||||||
|
@ -109,12 +109,6 @@ add_compile_definitions(BUILD_DATE="${BUILD_DATE}")
|
|||||||
add_compile_definitions(GIT_BRANCH_NAME="${GIT_BRANCH_NAME}")
|
add_compile_definitions(GIT_BRANCH_NAME="${GIT_BRANCH_NAME}")
|
||||||
add_compile_definitions(GIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
|
add_compile_definitions(GIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
|
||||||
# Fixes QWebEngine linker errors on Ubuntu 20.04
|
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(ThirdParty)
|
add_subdirectory(ThirdParty)
|
||||||
set(ECM_DIR "${THIRD_PARTY_PATH}/ecm")
|
set(ECM_DIR "${THIRD_PARTY_PATH}/ecm")
|
||||||
add_subdirectory(CMake)
|
add_subdirectory(CMake)
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "linux-debug",
|
"name": "linux-generic-debug",
|
||||||
"displayName": "ScreenPlay 64bit Debug Linux",
|
"displayName": "ScreenPlay 64bit Debug Linux",
|
||||||
"description": "Linux only!",
|
"description": "Linux only!",
|
||||||
"generator": "Ninja",
|
"generator": "Ninja",
|
||||||
@ -84,6 +84,40 @@
|
|||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
"rhs": "Linux"
|
"rhs": "Linux"
|
||||||
},
|
},
|
||||||
|
"architecture": {
|
||||||
|
"value": "x64",
|
||||||
|
"strategy": "external"
|
||||||
|
},
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_CXX_COMPILER": "g++",
|
||||||
|
"CMAKE_C_COMPILER": "gcc",
|
||||||
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
|
"VCPKG_TARGET_TRIPLET": "x64-linux",
|
||||||
|
"SCREENPLAY_STEAM": "OFF",
|
||||||
|
"SCREENPLAY_TESTS": "OFF"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "linux-relwithdebinfo",
|
||||||
|
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
|
||||||
|
"inherits": "linux-generic-debug",
|
||||||
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo",
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "linux-aqt-debug",
|
||||||
|
"displayName": "ScreenPlay 64bit Debug Linux using aqt",
|
||||||
|
"description": "Linux only!",
|
||||||
|
"generator": "Ninja",
|
||||||
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_Debug",
|
||||||
|
"condition": {
|
||||||
|
"type": "equals",
|
||||||
|
"lhs": "${hostSystemName}",
|
||||||
|
"rhs": "Linux"
|
||||||
|
},
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_path": "${sourceDir}/../aqt"
|
"qt_path": "${sourceDir}/../aqt"
|
||||||
},
|
},
|
||||||
@ -101,9 +135,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "linux-relwithdebinfo",
|
"name": "linux-aqt-relwithdebinfo",
|
||||||
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
|
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux using aqt",
|
||||||
"inherits": "linux-debug",
|
"inherits": "linux-ubuntu-debug",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
|
@ -87,11 +87,11 @@ endif()
|
|||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
find_package(ECM CONFIG REQUIRED NO_MODULE)
|
find_package(ECM CONFIG REQUIRED NO_MODULE)
|
||||||
set(LayerShellQt "/usr/local/lib/x86_64-linux-gnu/cmake/LayerShellQt/")
|
set(LayerShellQt "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/layer-shell-qt/")
|
||||||
find_package(LayerShellQt REQUIRED)
|
find_package(LayerShellQt REQUIRED)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
${PROJECT_NAME}
|
${PROJECT_NAME}
|
||||||
PRIVATE /usr/local/lib/x86_64-linux-gnu/libLayerShellQtInterface.so)
|
PRIVATE LayerShellQtInterface)
|
||||||
|
|
||||||
include(CopyRecursive)
|
include(CopyRecursive)
|
||||||
copy_recursive(${CMAKE_CURRENT_SOURCE_DIR}/kde/ScreenPlay ${CMAKE_BINARY_DIR}/bin/kde/ScreenPlay "*")
|
copy_recursive(${CMAKE_CURRENT_SOURCE_DIR}/kde/ScreenPlay ${CMAKE_BINARY_DIR}/bin/kde/ScreenPlay "*")
|
||||||
|
@ -27,7 +27,7 @@ Rectangle {
|
|||||||
loader.source = "qrc:/qml/ScreenPlayWallpaper/qml/MultimediaView.qml";
|
loader.source = "qrc:/qml/ScreenPlayWallpaper/qml/MultimediaView.qml";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Qt.platform.os === "windows") {
|
if (Qt.platform.os === "windows" || Qt.platform.os === "linux") {
|
||||||
loader.source = "qrc:/qml/ScreenPlayWallpaper/qml/MultimediaView.qml";
|
loader.source = "qrc:/qml/ScreenPlayWallpaper/qml/MultimediaView.qml";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
30
ThirdParty/CMakeLists.txt
vendored
30
ThirdParty/CMakeLists.txt
vendored
@ -8,13 +8,27 @@ FetchContent_Populate(
|
|||||||
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
||||||
SOURCE_DIR ${THIRD_PARTY_PATH}/QArchive)
|
SOURCE_DIR ${THIRD_PARTY_PATH}/QArchive)
|
||||||
|
|
||||||
FetchContent_Populate(
|
FetchContent_Populate(
|
||||||
qml-plausible
|
qml-plausible
|
||||||
GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
|
GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
|
||||||
GIT_TAG 5069ba3bf25663ea06be8b94c398d6c61058d4d5
|
GIT_TAG 5069ba3bf25663ea06be8b94c398d6c61058d4d5
|
||||||
# Workaround because: 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
|
# Workaround because: 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
|
||||||
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
||||||
SOURCE_DIR ${THIRD_PARTY_PATH}/qml-plausible)
|
SOURCE_DIR ${THIRD_PARTY_PATH}/qml-plausible)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
add_subdirectory(qml-plausible)
|
add_subdirectory(qml-plausible)
|
||||||
add_subdirectory(QArchive)
|
add_subdirectory(QArchive)
|
||||||
|
|
||||||
|
if(UNIX AND NOT APPLE)
|
||||||
|
FetchContent_Populate(
|
||||||
|
qt-layer-shell
|
||||||
|
GIT_REPOSITORY https://github.com/KDE/layer-shell-qt.git
|
||||||
|
GIT_TAG 721c0ae334554eb2396a2d4d3358f896b8c77412
|
||||||
|
# Workaround because: 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
|
||||||
|
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
||||||
|
SOURCE_DIR ${THIRD_PARTY_PATH}/qt-layer-shell)
|
||||||
|
add_subdirectory(qt-layer-shell)
|
||||||
|
|
||||||
|
endif()
|
Loading…
Reference in New Issue
Block a user