Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Fix wrong define

Browse Source 
Refactor qml check job
to use python env
Fix cmake copy for godot editor
This commit is contained in:
Elias Steurer 2023-11-09 12:29:12 +01:00
parent b66e293b55
commit 2f0a76c664
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab/ci/check_jobs.yml
View File

@ -1,18 +1,20 @@
formatting: formatting:
dependencies: [] dependencies: []
stage: check stage: check
allow_failure: true
image: image:
name: ubuntu:23.10 name: ubuntu:23.10
tags: tags:
- gitlab-org-docker - gitlab-org-docker
before_script:
- apt-get update -y
- apt-get install python3-pip python-is-python3 clang clang-format -y
script: script:
- python -m pip install -U pip wheel --break-system-packages - apt update -y
- python -m pip install -U cmakelang --break-system-packages # For Ubuntu 22.04 and newer we need to create an virutal env
- apt install python3.11 python3.11-venv clang clang-format -y
# Run this command in the ScreenPlay source root folder:
- python3 -m venv env
- source env/bin/activate
- python3 -m pip install -U pip wheel
- python3 -m pip install -U cmakelang
- cd Tools - cd Tools
- python check_format_cmake.py --check - python3 check_format_cmake.py --check
- python check_format_cpp.py --check - python3 check_format_cpp.py --check
#- python check_format_qml.py --check #- python check_format_qml.py --check

2
ScreenPlay/CMakeLists.txt
View File

@ -311,7 +311,6 @@ target_link_libraries(
Qt6::Xml) Qt6::Xml)
if(${SCREENPLAY_STEAM}) if(${SCREENPLAY_STEAM})
target_compile_definitions(ScreenPlayApp PRIVATE SCREENPLAY_STEAM)
target_link_libraries(ScreenPlayApp PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop) target_link_libraries(ScreenPlayApp PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop)
endif() endif()
@ -323,7 +322,6 @@ if(${SCREENPLAY_TESTS})
target_link_libraries(tst_ScreenPlay PRIVATE ScreenPlayApp ScreenPlayAppplugin Qt6::Test) target_link_libraries(tst_ScreenPlay PRIVATE ScreenPlayApp ScreenPlayAppplugin Qt6::Test)
generate_cmake_variable_header(tst_ScreenPlay) generate_cmake_variable_header(tst_ScreenPlay)
if(${SCREENPLAY_STEAM}) if(${SCREENPLAY_STEAM})
target_compile_definitions(tst_ScreenPlay PRIVATE SCREENPLAY_STEAM)
target_link_libraries(tst_ScreenPlay PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop) target_link_libraries(tst_ScreenPlay PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop)
endif() endif()
endif() endif()

2
ScreenPlay/src/settings.cpp
View File

@ -55,7 +55,7 @@ Settings::Settings(const std::shared_ptr<GlobalVariables>& globalVariables,
const QString isSteamVersion = QString("Is steam version: %1").arg((SCREENPLAY_STEAM_VERSION ? QString("✅ Yes") : QString("❌ No"))); const QString isSteamVersion = QString("Is steam version: %1").arg((SCREENPLAY_STEAM_VERSION ? QString("✅ Yes") : QString("❌ No")));
setBuildInfos(qtVersion + buildType + buildDate + commitHash + isDeployVersion + isSteamVersion); setBuildInfos(qtVersion + buildType + buildDate + commitHash + isDeployVersion + isSteamVersion);
setSteamVersion(SCREENPLAY_STEAM); setSteamVersion(SCREENPLAY_STEAM_VERSION);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
setDesktopEnvironment(DesktopEnvironment::Windows); setDesktopEnvironment(DesktopEnvironment::Windows);

2
Tools/CMakeLists.txt
View File

@ -12,7 +12,7 @@ add_custom_target(
set(GODOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Godot") set(GODOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Godot")
if(WIN32) if(WIN32 AND ${SCREENPLAY_GODOT})
# Todo: Add Linux and Mac support # Todo: Add Linux and Mac support
configure_file(${GODOT_PATH}/${GODOT_EDITOR_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ COPYONLY) configure_file(${GODOT_PATH}/${GODOT_EDITOR_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ COPYONLY)
endif() endif()