From 5319985da9ef50a3505e21f91556cdd08183cd73 Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Thu, 22 Feb 2024 14:41:38 -0500
Subject: [PATCH] [cmake] Fix c2py - clair test compatibility

---
 CMakeLists.txt      | 2 +-
 test/CMakeLists.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83a0a82..8e03b5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/c2py_flags DESTINATION ${CMAKE_INSTALL
 add_subdirectory(src/c2py)
 
 # Tests
-if(Build_Tests AND NOT IS_SUBPROJECT)
+if(Build_Tests AND (NOT IS_SUBPROJECT OR IS_CLAIR_BUILD))
   set(H5_INCLUDE_DIR ${PROJECT_BINARY_DIR}/deps/h5_src/c++/)
   enable_testing()
   add_subdirectory(test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 32b689e..2502a1d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,7 +31,7 @@ add_custom_command(
 )
 
 # ----------------------------
-set(c2py_all_low_level_tests cls)
+set(c2py_all_low_level_tests cls CACHE INTERNAL "")
 set(c2py_all_full_tests 
   annote basicfun
   cls_basic
@@ -47,7 +47,8 @@ set(c2py_all_full_tests
   tpl_derived
   callback
   two_module_1
-  two_module_2)
+  two_module_2
+  CACHE INTERNAL "")
 
 foreach(t ${c2py_all_low_level_tests})
   c2py_add_test_1(${t} "cxx")