Do not define TINYOBJLOADER_IMPLEMENTATION when building with CMake

This commit is contained in:
Silvio Traversaro
2022-05-27 19:28:45 +02:00
committed by Silvio
parent c7960385be
commit 2488d1c5b2
2 changed files with 5 additions and 0 deletions
+1
View File
@@ -25,3 +25,4 @@ set(MUJOCO_USER_SRCS
)
target_sources(mujoco PRIVATE ${MUJOCO_USER_SRCS})
target_compile_definitions(mujoco PRIVATE MUJOCO_DO_NOT_DEFINE_TINYOBJLOADER_IMPLEMENTATION)
+4
View File
@@ -25,7 +25,11 @@
#include <string>
#include <vector>
// This macro is defined when MuJoCo is built with CMake,
// not defined when MuJoCo is built with other build systems
#ifndef MUJOCO_DO_NOT_DEFINE_TINYOBJLOADER_IMPLEMENTATION
#define TINYOBJLOADER_IMPLEMENTATION
#endif
#include <mujoco/mjmodel.h>
#include "cc/array_safety.h"