dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit JSON header-only dependency to our repo.

This commit is contained in:
Par Winzell 2019-03-29 20:05:01 -07:00
parent 1f21a50cc9
commit c6ed20a45a
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -99,16 +99,6 @@ ExternalProject_Add(FiFoMap
) )
set(FIFO_MAP_INCLUDE_DIR "${CMAKE_BINARY_DIR}/fifo_map/src/FiFoMap/src") set(FIFO_MAP_INCLUDE_DIR "${CMAKE_BINARY_DIR}/fifo_map/src/FiFoMap/src")
# JSON
ExternalProject_Add(Json
PREFIX json
GIT_REPOSITORY https://github.com/nlohmann/json
GIT_TAG v2.1.1
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "Skipping JSON configure step."
BUILD_COMMAND ${CMAKE_COMMAND} -E echo "Skipping JSON build step."
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Skipping JSON install step."
)
set(JSON_INCLUDE_DIR "${CMAKE_BINARY_DIR}/json/src/Json/src")
# cppcodec # cppcodec
ExternalProject_Add(CPPCodec ExternalProject_Add(CPPCodec
@ -214,7 +204,6 @@ add_dependencies(libFBX2glTF
Draco Draco
MathFu MathFu
FiFoMap FiFoMap
Json
CPPCodec CPPCodec
Fmt Fmt
) )
@ -255,17 +244,18 @@ else()
) )
endif() endif()
target_include_directories(libFBX2glTF PUBLIC target_include_directories(libFBX2glTF SYSTEM PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
"third_party/stb" "third_party/stb"
"third_party/json"
) )
target_include_directories(libFBX2glTF SYSTEM PUBLIC target_include_directories(libFBX2glTF SYSTEM PUBLIC
Iconv::Iconv Iconv::Iconv
${FBXSDK_INCLUDE_DIR} ${FBXSDK_INCLUDE_DIR}
${DRACO_INCLUDE_DIR} ${DRACO_INCLUDE_DIR}
${MATHFU_INCLUDE_DIRS} ${MATHFU_INCLUDE_DIRS}
${FIFO_MAP_INCLUDE_DIR} ${FIFO_MAP_INCLUDE_DIR}
${JSON_INCLUDE_DIR}
${CPPCODEC_INCLUDE_DIR} ${CPPCODEC_INCLUDE_DIR}
${FMT_INCLUDE_DIR} ${FMT_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}