[#38] Update submodules

Godlike · Dec 22, 2018 · 008098c · 008098c
1 parent 533e59a
commit 008098c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Arion/cmake/GlmConfig.cmake b/Arion/cmake/GlmConfig.cmake
@@ -4,6 +4,7 @@
 
 set(GLM_INSTALL_ENABLE OFF CACHE BOOL "Flag to override default GLM_INSTALL_ENABLE value")
 set(GLM_TEST_ENABLE OFF CACHE BOOL "Flag to override default GLM_TEST_ENABLE value")
+add_compile_definitions(GLM_FORCE_SILENT_WARNINGS)
 
 if (NOT DEFINED GLM_ROOT_DIR)
     set(GLM_ROOT_DIR

diff --git a/Arion/godlike/Epona b/Arion/godlike/Epona
diff --git a/Arion/third_party/glm b/Arion/third_party/glm
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_policy(VERSION 3.0)
 
 project(ArionTests)
 
-include_directories(${ARION_INCLUDE_DIR} ${CATCH_ROOT}/single_include)
+include_directories(${ARION_INCLUDE_DIR} ${CATCH_ROOT}/single_include/catch2)
 
 function(arion_add_test)
     set(options)

diff --git a/third_party/Catch2 b/third_party/Catch2
+1 −1		Epona/include/Epona/JacobiEigenvalue.hpp
+8 −2		cmake/EponaConfig.cmake