Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Fix steam dll not being copied

Browse Source
This commit is contained in:
Elias Steurer 2023-12-08 21:13:19 +01:00
parent 69cb0066f8
commit 340562d3ca
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ScreenPlayWorkshop/CMakeLists.txt
View File

@ -15,6 +15,7 @@ find_package(
REQUIRED) REQUIRED)
set(QML set(QML
# cmake-format: sort # cmake-format: sort
qml/Background.qml qml/Background.qml
qml/Forum.qml qml/Forum.qml
@ -36,6 +37,7 @@ set(QML
qml/WorkshopItem.qml) qml/WorkshopItem.qml)
set(SOURCES set(SOURCES
# cmake-format: sort # cmake-format: sort
src/installedlistmodel.cpp src/installedlistmodel.cpp
src/screenplayworkshop.cpp src/screenplayworkshop.cpp
@ -47,6 +49,7 @@ set(SOURCES
src/steamworkshoplistmodel.cpp) src/steamworkshoplistmodel.cpp)
set(HEADER set(HEADER
# cmake-format: sort # cmake-format: sort
src/installedlistmodel.h src/installedlistmodel.h
src/screenplayworkshop.h src/screenplayworkshop.h
@ -60,6 +63,7 @@ set(HEADER
src/workshopitem.h) src/workshopitem.h)
set(RESOURCES set(RESOURCES
# cmake-format: sort # cmake-format: sort
assets/icons/icon_account_circle.svg assets/icons/icon_account_circle.svg
assets/icons/icon_arrow_left.svg assets/icons/icon_arrow_left.svg
@ -92,16 +96,17 @@ elseif(UNIX)
endif() endif()
qt_add_library(${PROJECT_NAME} STATIC ${RESOURCES}) qt_add_library(${PROJECT_NAME} STATIC ${RESOURCES})
# Needed by the automatic generated target missing includes # Needed by the automatic generated target missing includes
# https://github.com/qt/qtdeclarative/blob/7a7064e14f094e843e1ee832cc927e86f887621a/src/qml/Qt6QmlMacros.cmake#L2042 # https://github.com/qt/qtdeclarative/blob/7a7064e14f094e843e1ee832cc927e86f887621a/src/qml/Qt6QmlMacros.cmake#L2042
target_include_directories(${PROJECT_NAME} PUBLIC src/) target_include_directories(${PROJECT_NAME} PUBLIC src/)
target_link_libraries( target_link_libraries(
${PROJECT_NAME} ${PROJECT_NAME}
PUBLIC Qt6::Core PUBLIC Qt6::Core
Qt6::Quick Qt6::Quick
${STEAM_LIB} ${STEAM_LIB}
ScreenPlayUtil ScreenPlayUtil
SteamSDK) SteamSDK)
qt_add_qml_module( qt_add_qml_module(
${PROJECT_NAME} ${PROJECT_NAME}
@ -127,6 +132,8 @@ if(${SCREENPLAY_STEAM})
file(MAKE_DIRECTORY ${MACOS_FRAMEWORKS_DIR}) file(MAKE_DIRECTORY ${MACOS_FRAMEWORKS_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${MACOS_FRAMEWORKS_DIR} COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/steam_appid.txt ${MACOS_FRAMEWORKS_DIR} COPYONLY)
configure_file(${STEAM_BIN} ${MACOS_FRAMEWORKS_DIR} COPYONLY) configure_file(${STEAM_BIN} ${MACOS_FRAMEWORKS_DIR} COPYONLY)
else()
configure_file(${STEAM_BIN} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COPYONLY)
endif() endif()
if(${SCREENPLAY_TESTS}) if(${SCREENPLAY_TESTS})
@ -134,14 +141,14 @@ if(${SCREENPLAY_STEAM})
target_link_libraries( target_link_libraries(
tst_ScreenPlayWorkshop tst_ScreenPlayWorkshop
PRIVATE Qt6::Quick PRIVATE Qt6::Quick
Qt6::QuickControls2 Qt6::QuickControls2
${PROJECT_NAME}plugin ${PROJECT_NAME}plugin
ScreenPlayUtilplugin ScreenPlayUtilplugin
SteamSDK) SteamSDK)
if(APPLE) if(APPLE)
set_target_properties(tst_ScreenPlayWorkshop PROPERTIES RUNTIME_OUTPUT_DIRECTORY set_target_properties(tst_ScreenPlayWorkshop PROPERTIES RUNTIME_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/MacOS/") "${CMAKE_BINARY_DIR}/bin/ScreenPlay.app/Contents/MacOS/")
endif() endif()
endif() endif()
endif() endif()