tinygltf is a proper external now

UniStuttgart-VISUS · Mar 23, 2020 · bf34de5 · bf34de5
1 parent 69e6632
commit bf34de5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 27,548 deletions.
diff --git a/CMakeExternals.cmake b/CMakeExternals.cmake
@@ -107,6 +107,16 @@ function(require_external NAME)
       GIT_TAG "v1.3.0"
       INCLUDE_DIR "include")
 
+  # tinygltf
+  elseif(NAME STREQUAL "tinygltf")
+    if(TARGET tinygltf)
+      return()
+    endif()
+
+    add_external_headeronly_project(tinygltf
+      GIT_REPOSITORY https://github.com/syoyo/tinygltf.git
+      GIT_TAG "v2.2.0")
+
   # Built libraries #####################################################
 
   # adios2

diff --git a/plugins/mesh/CMakeLists.txt b/plugins/mesh/CMakeLists.txt
@@ -16,6 +16,7 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)
   # Add externals.
   require_external(quickhull)
   require_external(tinyobjloader)
+  require_external(tinygltf)
 
   # Collect source files
   file(GLOB_RECURSE public_header_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.h")
@@ -28,11 +29,10 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)
   set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg")
   target_compile_definitions(${PROJECT_NAME} PRIVATE ${EXPORT_NAME}_EXPORTS)
   target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                                                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/external>
                                                     "src")
   target_link_libraries(${PROJECT_NAME} 
     PRIVATE core 
-    PUBLIC quickhull tinyobjloader compositing_gl)
+    PUBLIC quickhull tinyobjloader tinygltf compositing_gl)
 
   if(MSVC)
       target_compile_definitions(${PROJECT_NAME} PRIVATE NOMINMAX)