Skip to content

Commit 4bf1ba6

Browse files
committed
Try stuff to make unittests pass
1 parent dde8263 commit 4bf1ba6

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: core/metacling/src/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ ROOT_LINKER_LIBRARY(Cling
119119

120120
# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
121121
add_dependencies(Cling rootcling_stage1)
122-
add_dependencies(Cling CppInterOpUnitTests)
122+
if(testing)
123+
add_dependencies(Cling CppInterOpUnitTests)
124+
endif()
123125

124126
if(MSVC)
125127
set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)

Diff for: interpreter/CppInterOp/unittests/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ endif()
3333
add_test(NAME cppinterop-${name} COMMAND ${name})
3434
set_tests_properties(cppinterop-${name} PROPERTIES
3535
TIMEOUT "${TIMEOUT_VALUE}"
36+
ENVIRONMENT "CPLUS_INCLUDE_PATH=${CMAKE_BINARY_DIR}/etc"
3637
LABELS
3738
DEPENDS)
3839
# FIXME: Just call gtest_add_tests this function is available.

0 commit comments

Comments
 (0)