Update dependencies

This commit is contained in:
Romain Thomas 2020-12-23 07:37:39 +01:00
parent ce58df93d8
commit f8bd135057
2 changed files with 9 additions and 23 deletions

View File

@ -286,19 +286,21 @@ target_include_directories(
PRIVATE "${LIEF_PRIVATE_INCLUDE_DIR}")
if(LIEF_ENABLE_JSON)
add_custom_target(
copy_json_files
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBJSON_SOURCE_DIR}/
${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/json.hpp
COMMAND
${CMAKE_COMMAND} -E copy_directory ${LIBJSON_SOURCE_DIR}/
${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/
DEPENDS lief_libjson)
add_dependencies(LIB_LIEF lief_libjson copy_json_files)
target_sources(LIB_LIEF PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/json.hpp)
endif()
if(LIEF_FROZEN_ENABLED)
add_dependencies(LIB_LIEF lief_frozen)
endif()
add_dependencies(LIB_LIEF lief_spdlog lief_rang_cpp_color lief_mbed_tls)
add_dependencies(LIB_LIEF lief_spdlog lief_mbed_tls)
# Flags definition
# ----------------

View File

@ -1,5 +1,5 @@
if(__add_lief_dependencies)
return()
return()
endif()
set(__add_lief_dependencies ON)
@ -26,22 +26,6 @@ else()
set(ENABLE_JSON_SUPPORT 0)
endif()
# Rang
# ----
set(LIBRANG_VERSION 2.1)
set(LIBRANG_SHA256 SHA256=32e0af3d3d4f628a26e7330d4384a93b16677e5fed57fbdf45ea267c525deba0)
set(LIBRANG_URL "${THIRD_PARTY_DIRECTORY}/rang-${LIBRANG_VERSION}.zip")
ExternalProject_Add(lief_rang_cpp_color
URL ${LIBRANG_URL}
URL_HASH ${LIBRANG_SHA256}
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND "")
ExternalProject_get_property(lief_rang_cpp_color SOURCE_DIR)
set(LIBRANG_SOURCE_DIR "${SOURCE_DIR}")
# mbed TLS
# --------