mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-25 04:02:50 +01:00
Update vcpkg
Fix compilation Remove unused benchmark
This commit is contained in:
parent
5b387545c1
commit
6bd7deaa43
@ -2,7 +2,6 @@ stages:
|
||||
- check
|
||||
- build
|
||||
- test
|
||||
- benchmark
|
||||
|
||||
check:
|
||||
stage: check
|
||||
|
@ -160,7 +160,6 @@ qt_update_translations("${CMAKE_CURRENT_SOURCE_DIR}/qml" "${L10N_LIST}")
|
||||
# Needed on macos
|
||||
find_package(Threads REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
find_package(benchmark 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...
|
||||
@ -191,8 +190,6 @@ target_link_libraries(
|
||||
ScreenPlayLib
|
||||
PUBLIC ScreenPlaySDK
|
||||
ScreenPlayUtil
|
||||
benchmark::benchmark
|
||||
benchmark::benchmark_main
|
||||
doctest::doctest
|
||||
sentry::sentry
|
||||
Threads::Threads
|
||||
|
@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 20)
|
||||
|
||||
find_package(
|
||||
Qt6
|
||||
COMPONENTS Quick QML Widgets Gui
|
||||
COMPONENTS Quick Widgets Gui
|
||||
REQUIRED)
|
||||
|
||||
set(SOURCES
|
||||
|
@ -31,7 +31,7 @@ if __name__ == "__main__":
|
||||
|
||||
vcpkg_path = os.path.join(project_source_parent_path, "ScreenPlay-vcpkg")
|
||||
print("vcpkg_path: ", vcpkg_path)
|
||||
vcpkg_version = "9172179c513aa84308e48b8dd0e3df90acec7204" # Master 25.06.2021
|
||||
vcpkg_version = "5ddd7f0" # Master 02.12.2021
|
||||
print("Build vcpkg ", vcpkg_version)
|
||||
execute("git fetch", vcpkg_path)
|
||||
execute("git checkout {}".format(vcpkg_version), vcpkg_path)
|
||||
@ -41,7 +41,6 @@ if __name__ == "__main__":
|
||||
"curl",
|
||||
"sentry-native",
|
||||
"doctest",
|
||||
"benchmark",
|
||||
"cpp-httplib"
|
||||
]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user