QuasarApp/LIEF
4
0
Fork 0
mirror of https://github.com/QuasarApp/LIEF.git synced 2025-05-01 14:49:35 +00:00
Code Issues Projects Releases Wiki Activity

Package json.hpp into third-party directory

Browse Source
This commit is contained in:
rthomas 2020-11-10 17:52:34 +01:00
parent 24d89a1315
commit 43a223b70f
2 changed files with 11 additions and 13 deletions

22
CMakeLists.txt

@ -114,12 +114,11 @@ set(LIEF_INCLUDE_FILES ${LIEF_INC_FILES} ${LIEF_VISITOR_INCLUDE_FILES})
set(LIEF_JSON_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/visitors/json.cpp") set(LIEF_JSON_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/visitors/json.cpp")
set(LIEF_JSON_HDR "${CMAKE_CURRENT_SOURCE_DIR}/include/LIEF/json.hpp" set(LIEF_JSON_HDR "${CMAKE_CURRENT_SOURCE_DIR}/include/LIEF/json.hpp"
"${LIBJSON_SOURCE_DIR}/json.hpp") "${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/json.hpp")
if(LIEF_ENABLE_JSON) if(LIEF_ENABLE_JSON)
list(APPEND LIBLIEF_SOURCE_FILES "${LIEF_JSON_SRC}") list(APPEND LIBLIEF_SOURCE_FILES "${LIEF_JSON_SRC}")
list(APPEND LIEF_INC_FILES "${LIEF_JSON_HDR}") list(APPEND LIEF_INC_FILES "${LIEF_JSON_HDR}")
list(APPEND LIEF_PUBLIC_INCLUDE_DIR "${LIBJSON_SOURCE_DIR}/")
endif() endif()
source_group("Header Files" FILES ${LIEF_INC_FILES}) source_group("Header Files" FILES ${LIEF_INC_FILES})
@ -250,14 +249,9 @@ list(APPEND LIEF_PUBLIC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/"
"${CMAKE_CURRENT_SOURCE_DIR}/api/c/include/" "${CMAKE_CURRENT_SOURCE_DIR}/api/c/include/"
"${CMAKE_CURRENT_BINARY_DIR}/include/") "${CMAKE_CURRENT_BINARY_DIR}/include/")
list( list(APPEND LIEF_PRIVATE_INCLUDE_DIR "${LIEF_PUBLIC_INCLUDE_DIR}"
APPEND "${LIBRANG_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src"
LIEF_PRIVATE_INCLUDE_DIR "${CMAKE_BINARY_DIR}")
"${LIEF_PUBLIC_INCLUDE_DIR}"
"${LIEF_PUBLIC_INCLUDE_DIR}"
"${LIBRANG_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/src"
"${CMAKE_BINARY_DIR}")
configure_file(${PROJECT_SOURCE_DIR}/LIEF.pc.in ${PROJECT_BINARY_DIR}/LIEF.pc configure_file(${PROJECT_SOURCE_DIR}/LIEF.pc.in ${PROJECT_BINARY_DIR}/LIEF.pc
@ONLY) @ONLY)
@ -271,7 +265,7 @@ source_group("mbedtls\\tls" FILES ${mbedtls_src_tls})
# Library definition # Library definition
# ================== # ==================
target_include_directories( target_include_directories(
LIB_LIEF SYSTEM PRIVATE "${ELG_SOURCE_DIR}" "${SPDLOG_SOURCE_DIR}/include" LIB_LIEF SYSTEM PRIVATE "${SPDLOG_SOURCE_DIR}/include"
"${MBEDTLS_INCLUDE_DIRS}") "${MBEDTLS_INCLUDE_DIRS}")
target_include_directories( target_include_directories(
@ -280,7 +274,11 @@ target_include_directories(
PRIVATE "${LIEF_PRIVATE_INCLUDE_DIR}") PRIVATE "${LIEF_PRIVATE_INCLUDE_DIR}")
if(LIEF_ENABLE_JSON) if(LIEF_ENABLE_JSON)
add_dependencies(LIB_LIEF lief_libjson) add_custom_target(
copy_json_files
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBJSON_SOURCE_DIR}/
${CMAKE_CURRENT_BINARY_DIR}/include/LIEF/third-party/)
add_dependencies(LIB_LIEF lief_libjson copy_json_files)
endif() endif()
if(LIEF_FROZEN_ENABLED) if(LIEF_FROZEN_ENABLED)

2
include/LIEF/json.hpp

@ -19,7 +19,7 @@
#include <LIEF/config.h> #include <LIEF/config.h>
#ifdef LIEF_JSON_SUPPORT #ifdef LIEF_JSON_SUPPORT
#include <json.hpp> #include <LIEF/third-party/json.hpp>
using json = nlohmann::json; using json = nlohmann::json;
#endif #endif