Merge branch 'master' into project_setup_refactor
# Conflicts: # 3rdParty/CMakeLists.txt # 3rdParty/libarchive/CMakeLists.txt # CMakeLists.txt
This commit is contained in:
11
3rdParty/libarchive/CMakeLists.txt
vendored
11
3rdParty/libarchive/CMakeLists.txt
vendored
@@ -28,12 +28,21 @@ function(LinkLibArchive TARGET)
|
||||
find_package(zstd QUIET)
|
||||
find_package(BZip2 QUIET)
|
||||
find_package(LibLZMA QUIET)
|
||||
find_package(LibXml2 QUIET)
|
||||
find_package(EXPAT QUIET)
|
||||
target_include_directories(${TARGET} PUBLIC ${LibArchive_INCLUDE_DIR})
|
||||
target_link_libraries(${TARGET} PUBLIC ${LibArchive_LIBRARIES} ${ZLIB_LIBRARIES} ${zstd_LIBRARIES} ${LZ4_LIBRARIES})
|
||||
|
||||
if (BZIP2_LIBRARIES)
|
||||
target_link_libraries(${TARGET} PUBLIC ${BZIP2_LIBRARIES})
|
||||
endif()
|
||||
if (LIBLZMA_LIBRARIES)
|
||||
target_link_libraries(${TARGET} PUBLIC ${LIBLZMA_LIBRARIES})
|
||||
endif()
|
||||
endfunction()
|
||||
if (LibXml2_FOUND)
|
||||
target_link_libraries(${TARGET} PUBLIC ${LIBXML2_LIBRARIES})
|
||||
endif()
|
||||
if (EXPAT_FOUND)
|
||||
target_link_libraries(${TARGET} PUBLIC ${EXPAT_LIBRARIES})
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
Reference in New Issue
Block a user