From 2e20673e67a69c1b15498edf7b97ead06a28363d Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Tue, 10 Mar 2020 12:34:34 +0100 Subject: [PATCH] Fix cmake files to be able to open the project in QtCreator --- ScreenPlay/CMakeLists.txt | 82 ++++++++++++++---------------- ScreenPlaySDK/CMakeLists.txt | 16 +++--- ScreenPlaySysInfo/CMakeLists.txt | 8 +-- ScreenPlayWallpaper/CMakeLists.txt | 8 +-- ScreenPlayWidget/CMakeLists.txt | 5 +- 5 files changed, 58 insertions(+), 61 deletions(-) diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index ab0da154..580052b9 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -8,47 +8,43 @@ find_package(Qt5Quick) find_package(Qt5Gui) find_package(Qt5Widgets) find_package(Qt5Core) -set(src $$PWD/main.cpp - $$PWD/app.cpp - $$PWD/src/createimportvideo.cpp - $$PWD/src/installedlistmodel.cpp - $$PWD/src/monitorlistmodel.cpp - $$PWD/src/screenplaywallpaper.cpp - $$PWD/src/screenplaywidget.cpp - $$PWD/src/settings.cpp - $$PWD/src/profilelistmodel.cpp - $$PWD/src/installedlistfilter.cpp - $$PWD/src/sdkconnector.cpp - $$PWD/src/projectsettingslistmodel.cpp - $$PWD/src/screenplaymanager.cpp - $$PWD/src/util.cpp - $$PWD/src/create.cpp) -set(headers $$PWD/app.h - $$PWD/src/globalvariables.h - $$PWD/src/createimportvideo.h - $$PWD/src/installedlistmodel.h - $$PWD/src/monitorlistmodel.h - $$PWD/src/screenplaywallpaper.h - $$PWD/src/screenplaywidget.h - $$PWD/src/settings.h - $$PWD/src/profilelistmodel.h - $$PWD/src/profile.h - $$PWD/src/projectfile.h - $$PWD/src/installedlistfilter.h - $$PWD/src/sdkconnector.h - $$PWD/src/projectsettingslistitem.h - $$PWD/src/projectsettingslistmodel.h - $$PWD/src/screenplaymanager.h - $$PWD/src/util.h - $$PWD/src/create.h) -set(resources $$PWD/Resources.qrc) -add_executable( ${src} ${headers} ${resources}) -target_link_libraries( PRIVATE Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets Qt5::Core) -target_include_directories( PUBLIC $ $) -target_include_directories( PUBLIC $ $) -target_include_directories( PUBLIC $ $) -target_include_directories( PUBLIC $ $) -target_compile_definitions( PRIVATE QT_DEPRECATED_WARNINGS) -target_compile_definitions( PRIVATE GIT_VERSION=\\\"$$GIT_VERSION\\\") -set_target_properties( PROPERTIES DEBUG_POSTFIX "d") +set(src main.cpp + app.cpp + src/createimportvideo.cpp + src/installedlistmodel.cpp + src/monitorlistmodel.cpp + src/screenplaywallpaper.cpp + src/screenplaywidget.cpp + src/settings.cpp + src/profilelistmodel.cpp + src/installedlistfilter.cpp + src/sdkconnector.cpp + src/projectsettingslistmodel.cpp + src/screenplaymanager.cpp + src/util.cpp + src/create.cpp) +set(headers app.h + src/globalvariables.h + src/createimportvideo.h + src/installedlistmodel.h + src/monitorlistmodel.h + src/screenplaywallpaper.h + src/screenplaywidget.h + src/settings.h + src/profilelistmodel.h + src/profile.h + src/projectfile.h + src/installedlistfilter.h + src/sdkconnector.h + src/projectsettingslistitem.h + src/projectsettingslistmodel.h + src/screenplaymanager.h + src/util.h + src/create.h) + +set(resources Resources.qrc) +add_executable(ScreenPlay ${src} ${headers} ${resources}) +target_link_libraries(ScreenPlay Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets Qt5::Core) +#target_compile_definitions( PRIVATE GIT_VERSION=\\\"$$GIT_VERSION\\\") + install(TARGETS DESTINATION Bin) diff --git a/ScreenPlaySDK/CMakeLists.txt b/ScreenPlaySDK/CMakeLists.txt index 13e03d13..4f19684f 100644 --- a/ScreenPlaySDK/CMakeLists.txt +++ b/ScreenPlaySDK/CMakeLists.txt @@ -6,11 +6,11 @@ find_package(Qt5Core) find_package(Qt5Quick) find_package(Qt5Gui) find_package(Qt5Qml) -set(src $$PWD/screenplay-sdk_plugin.cpp - $$PWD/screenplaysdk.cpp) -set(headers $$PWD/screenplay-sdk_plugin.h - $$PWD/screenplaysdk.h) -add_library($$qtLibraryTarget($$TARGET) MODULE ${src} ${headers}) -target_link_libraries($$qtLibraryTarget($$TARGET) PRIVATE Qt5::Core Qt5::Quick Qt5::Gui Qt5::Qml) -set_target_properties($$qtLibraryTarget($$TARGET) PROPERTIES DEBUG_POSTFIX "d") -install(TARGETS $$qtLibraryTarget($$TARGET) DESTINATION Libs) +set(src screenplay-sdk_plugin.cpp + screenplaysdk.cpp) +set(headers screenplay-sdk_plugin.h + screenplaysdk.h) +add_library(screenplaysdk MODULE ${src} ${headers}) +target_link_libraries(screenplaysdk PRIVATE Qt5::Core Qt5::Quick Qt5::Gui Qt5::Qml) +set_target_properties(screenplaysdk PROPERTIES DEBUG_POSTFIX "d") +install(TARGETS screenplaysdk DESTINATION Libs) diff --git a/ScreenPlaySysInfo/CMakeLists.txt b/ScreenPlaySysInfo/CMakeLists.txt index 61b2f9da..885e52de 100644 --- a/ScreenPlaySysInfo/CMakeLists.txt +++ b/ScreenPlaySysInfo/CMakeLists.txt @@ -17,7 +17,7 @@ set(headers screenplaysysinfo_plugin.h ram.h mathhelper.h storage.h) -add_library($$qtLibraryTarget($$TARGET) MODULE ${src} ${headers}) -target_link_libraries($$qtLibraryTarget($$TARGET) PRIVATE Qt5::Core Qt5::Quick Qt5::Gui Qt5::Qml) -set_target_properties($$qtLibraryTarget($$TARGET) PROPERTIES DEBUG_POSTFIX "d") -install(TARGETS $$qtLibraryTarget($$TARGET) DESTINATION Libs) + +add_library(screenplaysysinfo MODULE ${src} ${headers}) +target_link_libraries(screenplaysysinfo PRIVATE Qt5::Core Qt5::Quick Qt5::Gui Qt5::Qml) +install(TARGETS screenplaysysinfo DESTINATION Libs) diff --git a/ScreenPlayWallpaper/CMakeLists.txt b/ScreenPlayWallpaper/CMakeLists.txt index 1d4e7041..00b763be 100644 --- a/ScreenPlayWallpaper/CMakeLists.txt +++ b/ScreenPlayWallpaper/CMakeLists.txt @@ -23,8 +23,8 @@ set(headers src/basewindow.h src/macbridge.h src/macwindow.h) set(resources SPWResources.qrc) -add_executable( ${src} ${headers} ${resources}) -target_link_libraries( PRIVATE Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets Qt5::Core) -target_compile_definitions( PRIVATE QT_DEPRECATED_WARNINGS) -set_target_properties( PROPERTIES DEBUG_POSTFIX "d") +add_executable(ScreenPlayWallpaper ${src} ${headers} ${resources}) +target_link_libraries( ScreenPlayWallpaper Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets Qt5::Core) + + install(TARGETS DESTINATION Bin) diff --git a/ScreenPlayWidget/CMakeLists.txt b/ScreenPlayWidget/CMakeLists.txt index 9c19002d..b4c0baa7 100644 --- a/ScreenPlayWidget/CMakeLists.txt +++ b/ScreenPlayWidget/CMakeLists.txt @@ -12,5 +12,6 @@ set(src main.cpp src/widgetwindow.cpp) set(headers src/widgetwindow.h) set(resources SPWidgetResources.qrc) -target_link_libraries( PRIVATE Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets Qt5::Core) -target_compile_definitions( PRIVATE QT_DEPRECATED_WARNINGS) +add_executable(ScreenPlayWidget ${src} ${headers} ${resources}) +target_link_libraries( ScreenPlayWidget Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets Qt5::Core) +