Update json.hpp to fix compilation with clang with C++17(-std=c++1z) support.

2026-11-04 23:15:43 +00:00 · 2019-02-04 16:19:13 +09:00
parent 43ad313ad6
commit 871d8576b1
2 changed files with 9093 additions and 3407 deletions
@@ -23,15 +23,17 @@ endif (APPLE)

 set(CMAKE_CXX_STANDARD 11)

-if (${DRACO_DIR} STREQUAL "")
-else ()
-  # TODO(syoyo): better CMake script for draco
-  add_definitions(-DTINYGLTF_ENABLE_DRACO)
-  include_directories(${DRACO_DIR}/include)
-
-  link_directories(${DRACO_DIR}/lib)
-  set(DRACO_LIBRARY draco)
-endif ()
+if (DEFINED DRACO_DIR)
+  if (DRACO_DIR STREQUAL "")
+  else ()
+    # TODO(syoyo): better CMake script for draco
+    add_definitions(-DTINYGLTF_ENABLE_DRACO)
+    include_directories(${DRACO_DIR}/include)
+  
+    link_directories(${DRACO_DIR}/lib)
+    set(DRACO_LIBRARY draco)
+  endif ()
+endif()

 include_directories(
  ../../