diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 8c35f42a..642e9609 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -185,7 +185,9 @@ qt_add_big_resources(FONTS fonts.qrc) 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( ScreenPlayLib @@ -203,7 +205,8 @@ target_link_libraries( Qt6::WebSockets Qt6::Svg Qt6::WebEngineQuick - Qt6::WebEngineCore) + Qt6::WebEngineCore + ${LibArchive_LIBRARIES}) if(${TESTS_ENABLED}) add_executable(tst_ScreenPlay tests/tst_main.cpp) diff --git a/Tools/setup.py b/Tools/setup.py index f402f0b3..a01fe7c9 100644 --- a/Tools/setup.py +++ b/Tools/setup.py @@ -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 = "c1bd850c629977b98b71bd7a6ab6b7949a5f07e6" # Master 25.06.2021 print("Build vcpkg ", vcpkg_version) execute("git fetch", vcpkg_path) execute("git checkout {}".format(vcpkg_version), vcpkg_path) @@ -42,6 +42,7 @@ if __name__ == "__main__": "sentry-native", "doctest", "benchmark", + "libarchive", ] vcpkg_triplet = ""