Merge pull request #40 from assimp/update/update_dependencies

kimkulling · web-flow · commit c03e00811803 · 2025-02-12T23:21:49.000+01:00
Update/update dependencies
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "contrib/assimp"]
-	path = contrib/assimp
-	url = https://github.com/assimp/assimp.git
 [submodule "contrib/osre"]
 	path = contrib/osre
 	url = https://github.com/kimkulling/osre.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,6 +10,8 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
 
 SET(OSRE_BUILD_ED OFF CACHE BOOL "no osre ed" )
+SET(CPPCORE_BUILD_UNITTESTS OFF CACHE BOOL "no cppcore tests" )
+SET(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "no assimp tools" )
 
 add_subdirectory(contrib/osre)
 
diff --git a/contrib/assimp b/contrib/assimp
diff --git a/contrib/osre b/contrib/osre
@@ -1 +1 @@
-Subproject commit 14129296edf923d7a2dddda95b05f03222e7d69c
+Subproject commit 34517a8b518637d67d07439e96e158f929d7a73a
