GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build libarchive unless USE_SYSTEM_LIB_ARCHIVE is set

Browse Source
This commit is contained in:
Georg Hagen
2024-05-26 23:44:31 +02:00
parent 70cd46544b
commit 9926cdee0b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
3rdParty/CMakeLists.txt vendored
View File

@@ -17,7 +17,7 @@ add_subdirectory(tracy)
add_subdirectory(libstud-uuid) add_subdirectory(libstud-uuid)
add_subdirectory(rapidyaml) add_subdirectory(rapidyaml)
if (NOT LINUX) if (NOT USE_SYSTEM_LIB_ARCHIVE)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/libarchive COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/libarchive
@@ -26,9 +26,8 @@ execute_process(
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps
) )
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
endif() endif ()
function(LinkLibArchive TARGET) function(LinkLibArchive TARGET)
find_package(LibArchive REQUIRED) find_package(LibArchive REQUIRED)