Merge pull request #50 from pierrekraemer/develop

quick traversor + dynamic time step
cgogn · Jul 4, 2017 · 93b1785 · 93b1785
2 parents 5923a09 + a79ac7b
commit 93b1785
Show file tree

Hide file tree

Showing 7 changed files with 354 additions and 185 deletions.
diff --git a/schnapps/plugins/import/CMakeLists.txt b/schnapps/plugins/import/CMakeLists.txt
@@ -8,7 +8,6 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED)
 find_package(tinyxml2 REQUIRED)
 find_package(lm6 REQUIRED)
 find_package(ply REQUIRED)
-find_package(QOGLViewer REQUIRED)
 
 set(HEADER_FILES
 	dll.h

diff --git a/schnapps/plugins/shallow_water/CMakeLists.txt b/schnapps/plugins/shallow_water/CMakeLists.txt
@@ -37,7 +37,7 @@ target_link_libraries(${PROJECT_NAME}
 	schnapps_core
 	${cgogn_core_LIBRARIES}
 	${cgogn_modeling_LIBRARIES}
-	${cgogn_geoemtry_LIBRARIES}
+	${cgogn_geometry_LIBRARIES}
 	${Qt5Core_LIBRARIES}
 	${Qt5Widgets_LIBRARIES}
 )