Merge pull request #29 from assimp/kimkulling/fix_vcpkg_build

Kimkulling/fix vcpkg build
assimp · Aug 3, 2024 · ebd1efb · ebd1efb
2 parents 732545a + 7032a1e
commit ebd1efb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,13 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "default",
+            "binaryDir": "${sourceDir}",
+            "cacheVariables": {
+                "CMAKE_TOOLCHAIN_FILE": "contrib/osre/contrib/vcpkg/scripts/buildsystems/vcpkg.cmake"
+            }
+        }
+    ]
+}
+
diff --git a/contrib/osre b/contrib/osre
diff --git a/src/ModelLoading.cpp b/src/ModelLoading.cpp
@@ -38,7 +38,7 @@ using namespace ::OSRE::Common;
 using namespace ::OSRE::RenderBackend;
 
 /// @brief The log-tag
-static constexpr c8 Tag[] = "ModelLoadingApp";
+static constexpr c8 Tag[] = "Assimp-Viewer";
 
 //-------------------------------------------------------------------------------------------------
 ///	@ingroup    Editor
@@ -185,7 +185,7 @@ class ModelLoadingApp : public App::AppBase {
 
 int main(int argc, char *argv[]) {
     ModelLoadingApp myApp(argc, argv);
-    if (!myApp.initWindow(10, 10, 1024, 768, "ModelLoader sample! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
+    if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
         return 1;
     }
 

diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": [
+    "glm",
+    "sdl2"
+  ]
+}