88f740ba6c
Drop patches previously backported: root-doxygen-makefile.patch root-crash-fix.patch root-test-stress-32bit.patch Drop patches accepted upstream: root-test-subdirs.patch root-test-fixes.patch root-out-of-bounds.patch root-doxygen-tilde.patch root-noinst.patch Drop patches for issues fixed upstream: root-dont-link-jvm.patch root-system-pythia.patch Drop patch root-urw-otf-hack.patch - broken font file no longer present Drop Google Droid Sans Fallback font from EPEL 7 root-fonts package (the font is now available in EPEL 7) Use two more patches from Fedora's llvm5.0 package New root-test-subdirs.patch patch for more instances of the same issue Fix a test not setting cache file directory so that it works offline Fix a compatibility issue with the EPEL 7 gtest version Fix a missing include Workaround optimization problems in the Geom library New subpackages due to library splits root-tree-dataframe and root-vecops from root-tree-player root-net-httpsniff from root-net-http New subpackages due to package splits root-gui-html from root-gui root-gui-qtgsi from root-gui-qt root-io-xmlparser from root-io-xml root-proof-player from root-proof New ROOT 7 subpackages graf-gpadv7 graf-primitives gui-fitpanelv7 gui-qt5webdisplay Rename root-guibuilder package to root-gui-builder
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 41e33db9d17e4d295bf12958398fc3758d3e3a5b Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Tue, 19 Jun 2018 09:20:21 +0200
|
|
Subject: [PATCH] Include test directory using ROOT_ADD_TEST_SUBDIRECTORY
|
|
|
|
---
|
|
graf2d/gpadv7/CMakeLists.txt | 5 +----
|
|
graf2d/primitives/CMakeLists.txt | 5 ++---
|
|
2 files changed, 3 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/graf2d/gpadv7/CMakeLists.txt b/graf2d/gpadv7/CMakeLists.txt
|
|
index 525ce415451..9d6870231f3 100644
|
|
--- a/graf2d/gpadv7/CMakeLists.txt
|
|
+++ b/graf2d/gpadv7/CMakeLists.txt
|
|
@@ -11,7 +11,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7
|
|
DICTIONARY_OPTIONS "-writeEmptyRootPCM"
|
|
DEPENDENCIES ROOTGraphicsPrimitives)
|
|
|
|
-
|
|
-if(testing)
|
|
- ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
|
|
-endif()
|
|
+ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
|
|
diff --git a/graf2d/primitives/CMakeLists.txt b/graf2d/primitives/CMakeLists.txt
|
|
index f491eb70a90..d33597805d8 100644
|
|
--- a/graf2d/primitives/CMakeLists.txt
|
|
+++ b/graf2d/primitives/CMakeLists.txt
|
|
@@ -11,6 +11,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGraphicsPrimitives
|
|
SOURCES ${src}
|
|
DICTIONARY_OPTIONS "-writeEmptyRootPCM"
|
|
DEPENDENCIES RIO Core)
|
|
-if(testing)
|
|
- add_subdirectory(v7/test)
|
|
-endif()
|
|
+
|
|
+ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
|