Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-01 16:19:47 +02:00
Code Issues Projects Releases Activity

Update vcpkg

Browse Source 
Fix compilation
Remove unused benchmark
This commit is contained in:
Elias Steurer 2021-12-02 15:31:05 +01:00
parent 5b387545c1
commit 6bd7deaa43
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -2,7 +2,6 @@ stages:
- check - check
- build - build
- test - test
- benchmark
check: check:
stage: check stage: check

3
ScreenPlay/CMakeLists.txt
View File

@ -160,7 +160,6 @@ qt_update_translations("${CMAKE_CURRENT_SOURCE_DIR}/qml" "${L10N_LIST}")
# Needed on macos # Needed on macos
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
find_package(benchmark CONFIG REQUIRED)
find_package(doctest CONFIG REQUIRED) find_package(doctest CONFIG REQUIRED)
# CURL must be included before sentry because sentry needs the module and does not include it itself on macos... # CURL must be included before sentry because sentry needs the module and does not include it itself on macos...
@ -191,8 +190,6 @@ target_link_libraries(
ScreenPlayLib ScreenPlayLib
PUBLIC ScreenPlaySDK PUBLIC ScreenPlaySDK
ScreenPlayUtil ScreenPlayUtil
benchmark::benchmark
benchmark::benchmark_main
doctest::doctest doctest::doctest
sentry::sentry sentry::sentry
Threads::Threads Threads::Threads

2
ScreenPlayWorkshop/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 20)
find_package( find_package(
Qt6 Qt6
COMPONENTS Quick QML Widgets Gui COMPONENTS Quick Widgets Gui
REQUIRED) REQUIRED)
set(SOURCES set(SOURCES

3
Tools/setup.py
View File

@ -31,7 +31,7 @@ if __name__ == "__main__":
vcpkg_path = os.path.join(project_source_parent_path, "ScreenPlay-vcpkg") vcpkg_path = os.path.join(project_source_parent_path, "ScreenPlay-vcpkg")
print("vcpkg_path: ", vcpkg_path) print("vcpkg_path: ", vcpkg_path)
vcpkg_version = "9172179c513aa84308e48b8dd0e3df90acec7204" # Master 25.06.2021 vcpkg_version = "5ddd7f0" # Master 02.12.2021
print("Build vcpkg ", vcpkg_version) print("Build vcpkg ", vcpkg_version)
execute("git fetch", vcpkg_path) execute("git fetch", vcpkg_path)
execute("git checkout {}".format(vcpkg_version), vcpkg_path) execute("git checkout {}".format(vcpkg_version), vcpkg_path)
@ -41,7 +41,6 @@ if __name__ == "__main__":
"curl", "curl",
"sentry-native", "sentry-native",
"doctest", "doctest",
"benchmark",
"cpp-httplib" "cpp-httplib"
] ]