Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build when using vcpkg-ified cesium-native #424

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions native~/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.18)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# Make sure we use the same runtime library as cesium-native so our binaries are compatible
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

project(CesiumForUnityNative
VERSION 0.1.0
LANGUAGES CXX C
Expand Down
4 changes: 4 additions & 0 deletions native~/Runtime/src/CesiumFeatureImpl.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif

#include "CesiumFeatureImpl.h"

#include <CesiumGltf/MetadataConversions.h>
Expand Down
3 changes: 3 additions & 0 deletions native~/Runtime/src/CesiumGlobeAnchorImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
#include <DotNet/UnityEngine/Quaternion.h>
#include <DotNet/UnityEngine/Transform.h>
#include <DotNet/UnityEngine/Vector3.h>
#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/gtx/quaternion.hpp>

using namespace CesiumGeometry;
Expand Down
3 changes: 3 additions & 0 deletions native~/Runtime/src/CesiumMetadataValueImpl.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#pragma once

#include <DotNet/System/String.h>
#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>

#include <variant>
Expand Down
4 changes: 4 additions & 0 deletions native~/Runtime/src/CesiumPropertyTablePropertyImpl.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#pragma once

#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif

#include "CesiumPropertyTablePropertyImpl.h"

#include "CesiumFeaturesMetadataUtility.h"
Expand Down
3 changes: 1 addition & 2 deletions native~/Runtime/src/UnityPrepareRendererResources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
#include <CesiumGltf/ExtensionExtMeshFeatures.h>
#include <CesiumGltf/ExtensionKhrMaterialsUnlit.h>
#include <CesiumGltf/ExtensionKhrTextureTransform.h>
#include <CesiumGltf/ExtensionMeshPrimitiveExtFeatureMetadata.h>
#include <CesiumGltf/ExtensionModelExtFeatureMetadata.h>
#include <CesiumGltf/ExtensionMeshPrimitiveExtStructuralMetadata.h>
#include <CesiumGltf/ExtensionModelExtStructuralMetadata.h>
#include <CesiumGltfContent/GltfUtilities.h>
#include <CesiumGltfReader/GltfReader.h>
Expand Down
2 changes: 1 addition & 1 deletion native~/extern/cesium-native
Submodule cesium-native updated 153 files
Loading