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

Add libarchive

Browse Source
This commit is contained in:
Graphicscore 2021-10-16 20:44:22 +02:00
parent 6bcd2ad24b
commit 9ef52a3381
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ScreenPlay/CMakeLists.txt
View File

@ -185,7 +185,9 @@ qt_add_big_resources(FONTS fonts.qrc)
add_library(ScreenPlayLib ${SOURCES} ${HEADER} ${RESOURCES} ${FONTS}) add_library(ScreenPlayLib ${SOURCES} ${HEADER} ${RESOURCES} ${FONTS})
target_include_directories(ScreenPlayLib PUBLIC ./ src/) target_include_directories(ScreenPlayLib PUBLIC ./ src/ ${LibArchive_INCLUDE_DIRS})
find_package(LibArchive REQUIRED)
target_link_libraries( target_link_libraries(
ScreenPlayLib ScreenPlayLib
@ -203,7 +205,8 @@ target_link_libraries(
Qt6::WebSockets Qt6::WebSockets
Qt6::Svg Qt6::Svg
Qt6::WebEngineQuick Qt6::WebEngineQuick
Qt6::WebEngineCore) Qt6::WebEngineCore
${LibArchive_LIBRARIES})
if(${TESTS_ENABLED}) if(${TESTS_ENABLED})
add_executable(tst_ScreenPlay tests/tst_main.cpp) add_executable(tst_ScreenPlay tests/tst_main.cpp)

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 = "c1bd850c629977b98b71bd7a6ab6b7949a5f07e6" # Master 25.06.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)
@ -42,6 +42,7 @@ if __name__ == "__main__":
"sentry-native", "sentry-native",
"doctest", "doctest",
"benchmark", "benchmark",
"libarchive",
] ]
vcpkg_triplet = "" vcpkg_triplet = ""