From 6498927d4beeb59038e9778af0fa67a2a28d246d Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Fri, 11 Jan 2019 16:04:09 +0100
Subject: [PATCH] core/dictgen: do not use file globbing
---
core/dictgen/CMakeLists.txt | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/core/dictgen/CMakeLists.txt b/core/dictgen/CMakeLists.txt
index 7cff48f06a0..0071a8b04db 100644
--- a/core/dictgen/CMakeLists.txt
+++ b/core/dictgen/CMakeLists.txt
@@ -10,11 +10,19 @@
ROOT_ADD_COMPILE_OPTIONS(-Wno-class-memaccess)
-ROOT_GLOB_SOURCES(sources ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
-
ROOT_OBJECT_LIBRARY(Dictgen
- ${sources}
+ BaseSelectionRule.cxx
+ ClassSelectionRule.cxx
+ DictSelectionReader.cxx
+ LinkdefReader.cxx
+ rootcling_impl.cxx
+ Scanner.cxx
+ SelectionRules.cxx
+ TModuleGenerator.cxx
+ VariableSelectionRule.cxx
+ XMLReader.cxx
)
+
add_dependencies(Dictgen CLING)
target_include_directories(Dictgen PRIVATE
@@ -22,8 +30,9 @@ target_include_directories(Dictgen PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/res
${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res
${CMAKE_CURRENT_SOURCE_DIR}/../clingutils/res
+ ${CLING_INCLUDE_DIRS}
)
-target_include_directories(Dictgen PRIVATE ${CLING_INCLUDE_DIRS})
+
# Register the llvm include directories after clangs. This instructs the compiler to resolve
# headers from our builtin clang. That's an issue when we are building with bultin_llvm=Off
# and we have installed clang headers, too.
--
GitLab