diff --git a/Arion/cmake/GlmConfig.cmake b/Arion/cmake/GlmConfig.cmake index 079f32f..237164f 100644 --- 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 index 1bc6f3a..99e20f5 160000 --- a/Arion/godlike/Epona +++ b/Arion/godlike/Epona @@ -1 +1 @@ -Subproject commit 1bc6f3a91591b19fe6b15c8f6da6653b6acc0f8b +Subproject commit 99e20f55e67963e9578c18b0fe822218d982e112 diff --git a/Arion/third_party/glm b/Arion/third_party/glm index 1190ae0..437a131 160000 --- a/Arion/third_party/glm +++ b/Arion/third_party/glm @@ -1 +1 @@ -Subproject commit 1190ae0b0e6ab38dc4a650ce7ad79be66a7a4de1 +Subproject commit 437a131adb3205b20abb5432eb705b36abb8b51f diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f7f009b..7ad9525 100644 --- 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 index c4d1aa9..461843b 160000 --- a/third_party/Catch2 +++ b/third_party/Catch2 @@ -1 +1 @@ -Subproject commit c4d1aa90337300a8c7646b3f28b0a6783eec5a8f +Subproject commit 461843b1f02a4bf5c59db88ff201d2c56fabf3a4