Skip to content

Commit 12ae770

Browse files
committed
Revert "Adding dependency for slavedict generation on masterdict"
This reverts commit 2a4cfad. We are investigating why it fails in make.
1 parent 2a4cfad commit 12ae770

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

cling/template/CMakeLists.txt

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,8 @@ ROOTTEST_ADD_TEST(templateSingleton
1111
DEPENDS Singleton.h
1212
LABELS roottest regression cling)
1313

14-
ROOTTEST_GENERATE_DICTIONARY(masterDict
15-
master.h
16-
LINKDEF
17-
masterLinkDef.h
18-
)
19-
20-
ROOTTEST_GENERATE_DICTIONARY(slaveDict
21-
slave.h
22-
LINKDEF
23-
slaveLinkDef.h
24-
DEPENDS
25-
masterDictlibgen
26-
)
27-
14+
ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h)
15+
ROOTTEST_GENERATE_DICTIONARY(masterDict master.h LINKDEF masterLinkDef.h)
2816
ROOTTEST_GENERATE_DICTIONARY(forwardDict forward.C LINKDEF linkdef.h)
2917
ROOTTEST_GENERATE_DICTIONARY(constructorDict constructor.hh LINKDEF linkdef.h)
3018
ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h)
@@ -48,10 +36,10 @@ ROOTTEST_ADD_TEST(interpreted
4836
ROOTTEST_ADD_TEST(compiled
4937
MACRO smalltest.C+
5038
LABELS roottest regression cling)
51-
39+
5240
ROOTTEST_ADD_TEST(defaultTemplateParam
5341
MACRO execdefaultTemplateParam.cxx+
5442
OUTREF execdefaultTemplateParam.ref
5543
LABELS roottest regression cling)
56-
44+
5745
ROOTTEST_ADD_TESTDIRS()

0 commit comments

Comments
 (0)