From 74165a4968d11e6f1c62285a20fe2df90ac98d6d Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Sun, 6 Dec 2020 15:01:11 +0100 Subject: [PATCH] Add libarchive dependency --- 3rdParty/CMakeLists.txt | 3 ++- 3rdParty/libarchive/CMakeLists.txt | 13 +++++++++++++ CMakeLists.txt | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 3rdParty/libarchive/CMakeLists.txt diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index 6587d22..abba67c 100644 --- a/3rdParty/CMakeLists.txt +++ b/3rdParty/CMakeLists.txt @@ -9,4 +9,5 @@ add_subdirectory(magic-enum) add_subdirectory(yaml-cpp) add_subdirectory(pugixml) add_subdirectory(opencv) -add_subdirectory(PlatformFolders) \ No newline at end of file +add_subdirectory(PlatformFolders) +add_subdirectory(libarchive) \ No newline at end of file diff --git a/3rdParty/libarchive/CMakeLists.txt b/3rdParty/libarchive/CMakeLists.txt new file mode 100644 index 0000000..1f99874 --- /dev/null +++ b/3rdParty/libarchive/CMakeLists.txt @@ -0,0 +1,13 @@ +include(FetchContent) +FetchContent_Declare( + libarchive + GIT_REPOSITORY https://github.com/libarchive/libarchive.git + GIT_TAG v3.5.1 + GIT_SHALLOW TRUE +) +set(ENABLE_TEST OFF) +set(ENABLE_TAR OFF) +set(ENABLE_CPIO OFF) +set(ENABLE_CAT OFF) +set(ENABLE_OPENSSL OFF) +FetchContent_MakeAvailable(libarchive) \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7032f..63e5366 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ target_link_libraries(openVulkanoCpp PRIVATE glfw) endif() target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS}) -target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp spdlog glm assimp pugixml ${OpenCV_LIBS} sago::platform_folders) +target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp spdlog glm assimp pugixml ${OpenCV_LIBS} sago::platform_folders archive_static) add_compile_definitions(GLM_FORCE_INTRINSICS)