From dd40775b1440f00c6ca3537fefd1af6ea7694b7e Mon Sep 17 00:00:00 2001 From: Pere Mato Date: Mon, 7 Jul 2014 18:00:18 +0200 Subject: [PATCH] Fix for ROOT-6459 --- cmake/modules/RootNewMacros.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake index 530e44b..055d475 100644 --- a/cmake/modules/RootNewMacros.cmake +++ b/cmake/modules/RootNewMacros.cmake @@ -120,7 +120,9 @@ function(ROOT_GET_SOURCES variable cwd ) endif() if(files) foreach(s ${files}) - if(s MATCHES "${cwd}/G__") # Eliminate G__* files only when using wildcards + if(fp MATCHES "[*]" AND s MATCHES "(^|/)G__") # Eliminate G__* files + elseif(s MATCHES "${cwd}/G__") + set(sources ${fp} ${sources}) else() set(sources ${sources} ${s}) endif() -- 1.8.2