[math] Migrate old Makefiles to CMake and reenable non-covered tests

Author: ferdymercury

cmake/modules/RootMacros.cmake

@@ -198,13 +198,14 @@ function(REFLEX_GENERATE_DICTIONARY dictionary)
     LIST(APPEND definitions "$<FILTER:$<TARGET_PROPERTY:${dictionary},COMPILE_DEFINITIONS>,EXCLUDE,^$>")
   ENDIF()
 
+  set(ROOT_genreflex_CMD $<TARGET_FILE:genreflex>)
   add_custom_command(
-    OUTPUT ${gensrcdict} ${rootmapname}
     COMMAND ${ROOT_genreflex_CMD}
     ARGS ${headerfiles} -o ${gensrcdict} ${rootmapopts} --select=${selectionfile}
          ${ARG_OPTIONS}
          "-I$<JOIN:$<REMOVE_DUPLICATES:$<FILTER:${include_dirs},EXCLUDE,^$>>,;-I>"
          "$<$<BOOL:$<JOIN:${definitions},>>:-D$<JOIN:${definitions},;-D>>"
+    OUTPUT ${gensrcdict} ${rootmapname}
     DEPENDS ${headerfiles} ${selectionfile} ${ARG_DEPENDS}
 
     COMMAND_EXPAND_LISTS
@@ -2749,8 +2750,6 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
     set(CMAKE_ROOTTEST_NOROOTMAP OFF)
   endif()
 
-  set(ROOT_genreflex_CMD ${ROOT_BINDIR}/genreflex)
-
   ROOTTEST_TARGETNAME_FROM_FILE(targetname ${dictionary})
 
   set(targetname_libgen ${targetname}-libgen)

math/genvector/test/CMakeLists.txt

@@ -16,8 +16,22 @@ ROOT_EXECUTABLE(testGenvector testGenVector.cxx LIBRARIES GenVector Hist Smatrix
 ROOT_ADD_TEST(test-genvector-genvector COMMAND testGenvector)
 
 ROOT_EXECUTABLE(testVectorIO testVectorIO.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
+target_include_directories(testVectorIO PRIVATE ./)
 ROOT_ADD_TEST(test-genvector-vectorio COMMAND testVectorIO
-                                      COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/Track.h)
+                                      COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/Track.h
+                                      FIXTURES_SETUP vectoriofixture)
+
+ROOT_GENERATE_DICTIONARY(GVTrackDict Track.h LINKDEF TrackLinkDef.h OPTIONS -inlineInputHeader)
+ROOT_EXECUTABLE(testVectorIOdict testVectorIO.cxx GVTrackDict.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
+REFLEX_GENERATE_DICTIONARY(GVTrackDictXml Track.h SELECTION TrackDict.xml)
+ROOT_EXECUTABLE(testVectorIOdictXml testVectorIO.cxx GVTrackDictXml.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
+target_include_directories(testVectorIOdict PRIVATE ./)
+target_include_directories(testVectorIOdictXml PRIVATE ./)
+target_compile_definitions(testVectorIOdictXml PRIVATE USE_REFLEX)
+ROOT_ADD_TEST(test-genvector-vectoriodict COMMAND testVectorIOdict
+                                      FIXTURES_REQUIRED vectoriofixture FIXTURES_SETUP vectoriodictrun)
+ROOT_ADD_TEST(test-genvector-vectoriodictxml COMMAND testVectorIOdictXml
+                                      FIXTURES_REQUIRED vectoriodictrun)
 
 ROOT_EXECUTABLE(coordinates3D coordinates3D.cxx LIBRARIES GenVector)
 ROOT_ADD_TEST(test-genvector-coordinates3D COMMAND coordinates3D)

math/genvector/test/Makefile

@@ -57,3 +57,5 @@ ROOT_GENERATE_DICTIONARY(G__Smatrix32
     Core
     MathCore
 )
+
+ROOT_ADD_TEST_SUBDIRECTORY(test)