[nfc] try fix dict generation

Author: ferdymercury

tree/tree/test/CMakeLists.txt

@@ -6,21 +6,17 @@
 
 
 ROOT_GENERATE_DICTIONARY(ElementStructDict ElementStruct.h LINKDEF ElementStructLinkDef.h OPTIONS -inlineInputHeader)
-ROOT_GENERATE_DICTIONARY(TestRefObjDict TestRefObj.h LINKDEF TestRefObjLinkDef.h OPTIONS -inlineInputHeader)
 ROOT_ADD_GTEST(testTOffsetGeneration TOffsetGeneration.cxx ElementStruct.cxx ElementStructDict.cxx
   LIBRARIES RIO Tree MathCore
 )
-ROOT_ADD_GTEST(testClonesArray testClonesArray.cxx TestRefObj.cxx TestRefObjDict.cxx LIBRARIES RIO Tree)
 if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
   add_custom_command(TARGET testTOffsetGeneration POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libElementStructDict_rdict.pcm
                                      ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/libElementStructDict_rdict.pcm)
-  add_custom_command(TARGET testClonesArray POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libTestRefObjDict_rdict.pcm
-                                     ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/libTestRefObjDict_rdict.pcm)
 endif()
 target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
+ROOT_STANDARD_LIBRARY_PACKAGE(TestRefObj NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/TestRefObj.h SOURCES TestRefObj.cxx LINKDEF TestRefObjLinkDef.h DEPENDENCIES RIO)
 ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
 #FIXME: tests are having timeout on 32bit CERN VM (in docker container everything is fine),
 # to be reverted after investigation.
@@ -31,6 +27,7 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
 endif()
 ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(testTBranch TBranch.cxx LIBRARIES RIO Tree MathCore)
+ROOT_ADD_GTEST(testClonesArray testClonesArray.cxx LIBRARIES RIO Tree TestRefObj)
 ROOT_ADD_GTEST(testTIOFeatures TIOFeatures.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(testTTreeCluster TTreeClusterTest.cxx LIBRARIES RIO Tree MathCore)
 ROOT_ADD_GTEST(testTChainParsing TChainParsing.cxx LIBRARIES RIO Tree)

tree/tree/test/SillyStruct.cxx

@@ -1,3 +1,3 @@
 #include "SillyStruct.h"
 
-ClassImp(SillyStruct)
+// ClassImp(SillyStruct)

tree/tree/test/SillyStruct.h

@@ -1,3 +1,6 @@
+#ifndef SILLYSTRUCT_H
+#define SILLYSTRUCT_H
+
 #include "Rtypes.h"
 #include "TObject.h"
 
@@ -15,3 +18,5 @@ class SillyStruct : public TObject {
 
    ClassDefOverride(SillyStruct, 1)
 };
+
+#endif

tree/tree/test/TestRefObj.h

@@ -8,7 +8,7 @@
 class TestRefObj : public TObject {
 protected:
    TRefArray lChildren;
-    
+
 public:
    TestRefObj() : lChildren() {}
    virtual ~TestRefObj() {}