Update spdlog to v1.9.2

celerity · Feb 21, 2022 · a178828 · a178828
1 parent 7a5326a
commit a178828
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -320,10 +320,10 @@ install(
 	NAMESPACE spdlog::
 	FILE spdlogConfigTargets.cmake
 )
-configure_file(
-	vendor/spdlog/cmake/spdlogConfig.cmake.in
-	"${spdlog_PROJECT_CONFIG_OUT}"
-	@ONLY
+configure_package_config_file(
+  vendor/spdlog/cmake/spdlogConfig.cmake.in
+  "${spdlog_PROJECT_CONFIG_OUT}"
+  INSTALL_DESTINATION lib/celerity/vendor/cmake
 )
 write_basic_package_version_file(
 	"${spdlog_VERSION_CONFIG_FILE}"

diff --git a/include/grid.h b/include/grid.h
@@ -2,6 +2,7 @@
 
 #include <CL/sycl.hpp>
 #include <allscale/api/user/data/grid.h>
+#undef assert_fail // Incompatible with fmt
 
 #include "ranges.h"
 

diff --git a/vendor/spdlog b/vendor/spdlog