Skip to content

Commit

Permalink
[cmake] Fix c2py - clair test compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Wentzell committed Feb 22, 2024
1 parent 4fa1be1 commit 5319985
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
5 changes: 3 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 5319985

Please sign in to comment.