Skip to content

Commit b993fb2

Browse files
committed
[CMake] Link TFormulaTests also against Vc if available
This is needed for the vectorization tests. Also, remove the `BUILTINS Vc` arguments, that were used to declare dependencies in builtins at the level of CMake targets. But this is not needed anymore, as `Vc` in the `Vc_LIBRARIES` is a target itself now when using `builtin_vc` (as of e147d36).
1 parent d001af4 commit b993fb2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,15 @@ ROOT_EXECUTABLE(delaunayTriangulation delaunayTriangulation.cxx LIBRARIES Hist)
301301
ROOT_ADD_TEST(test-delaunay COMMAND delaunayTriangulation)
302302

303303
#--TestTformula------------------------------------------------------------------------------------
304-
ROOT_EXECUTABLE(TFormulaTests TFormulaTests.cxx LIBRARIES Hist RIO)
304+
ROOT_EXECUTABLE(TFormulaTests TFormulaTests.cxx LIBRARIES Hist RIO ${Vc_LIBRARIES})
305305
if(MSVC)
306306
set_property(TARGET TFormulaTests APPEND_STRING PROPERTY LINK_FLAGS "/STACK:4000000")
307307
endif()
308308
ROOT_ADD_TEST(test-TFormulaTests COMMAND TFormulaTests FAILREGEX "FAILED|Error in")
309309

310310
#--Vc basic test-----------------------------------------------------------------------------------
311311
if(vc)
312-
ROOT_EXECUTABLE(testVc testVc.cxx LIBRARIES ${Vc_LIBRARIES} BUILTINS Vc)
312+
ROOT_EXECUTABLE(testVc testVc.cxx LIBRARIES ${Vc_LIBRARIES})
313313
target_include_directories(testVc SYSTEM BEFORE PRIVATE ${Vc_INCLUDE_DIRS})
314314
ROOT_ADD_TEST(test-Vc COMMAND testVc FAILREGEX "FAILED|Error in")
315315
endif()
@@ -328,7 +328,7 @@ endif()
328328

329329
#--Vc GenVector test-----------------------------------------------------------------------------------
330330
if(vc)
331-
ROOT_EXECUTABLE(testGenVectorVc testGenVectorVc.cxx LIBRARIES Physics GenVector ${Vc_LIBRARIES} BUILTINS Vc)
331+
ROOT_EXECUTABLE(testGenVectorVc testGenVectorVc.cxx LIBRARIES Physics GenVector ${Vc_LIBRARIES})
332332
target_include_directories(testGenVectorVc SYSTEM BEFORE PRIVATE ${Vc_INCLUDE_DIRS})
333333
ROOT_ADD_TEST(test-GenVector-Vc COMMAND testGenVectorVc FAILREGEX "FAILED|Error in")
334334
endif()

0 commit comments

Comments
 (0)