From 2203eb6df66c27d21fd70613a2d8ffa0a8a10286 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 28 Mar 2024 16:05:06 +0100 Subject: [PATCH] Enable memory profiling and fix compile issues when building without tracy --- apps/OpenSpace/CMakeLists.txt | 3 +++ apps/OpenSpace/ext/sgct | 2 +- ext/ghoul | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt index f79ee8f174..3afa51cfed 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -115,6 +115,9 @@ set(SGCT_DEP_INCLUDE_FREETYPE OFF CACHE BOOL "" FORCE) set(SGCT_DEP_INCLUDE_FMT OFF CACHE BOOL "" FORCE) set(SGCT_DEP_INCLUDE_SCN OFF CACHE BOOL "" FORCE) set(SGCT_DEP_INCLUDE_CATCH2 OFF CACHE BOOL "" FORCE) +if (TRACY_ENABLE) + set(SGCT_MEMORY_PROFILING ON CACHE BOOL "" FORCE) +endif () add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct) target_link_libraries(OpenSpace PRIVATE sgct) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 49d1c03a28..3a92028182 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 49d1c03a2857d370afcb419c361a158cda0e31a7 +Subproject commit 3a9202818242eb707f34093e068cf9b8f8f9dbb1 diff --git a/ext/ghoul b/ext/ghoul index c6d49eda51..9198ad2135 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit c6d49eda51ce34e729bf931d69e638c73c8e254a +Subproject commit 9198ad2135c73dea10168a8f6e9072b95755ae52