From 15865102dcce5ee82c5b35811b62d36cd731936a Mon Sep 17 00:00:00 2001 From: Adam Dempsey Date: Sun, 12 Jan 2025 11:10:44 -0700 Subject: [PATCH 1/2] Update singularity eos --- external/singularity-eos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/singularity-eos b/external/singularity-eos index f7df74f..3f78b83 160000 --- a/external/singularity-eos +++ b/external/singularity-eos @@ -1 +1 @@ -Subproject commit f7df74f90d53e97d048cd230eec1d6203d7c37d2 +Subproject commit 3f78b8306701c8265eb54e4572a3d382a7a727e4 From d0767c36dd0ba45ae04510b81b60a9c3c6dd8e3f Mon Sep 17 00:00:00 2001 From: Adam Dempsey Date: Mon, 13 Jan 2025 08:17:27 -0700 Subject: [PATCH 2/2] Add generated directory to singularity include path --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40c1035..a0face6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,8 @@ set(ARTEMIS_SINGULARITY_INCLUDE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external/singularity-eos/utils/variant/include ${CMAKE_CURRENT_SOURCE_DIR}/external/singularity-opac/utils ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}) + ${CMAKE_CURRENT_SOURCE_DIR} + $) # Set Jaybenne config options and paths # NOTE(@pdmullen): For the life of us, we are still not sure why we can't treat