From: Kefu Chai <kchai@redhat.com>
Date: Mon, 17 May 2021 04:54:16 +0000 (+0800)
Subject: cmake: do not specify subdirectories in file(GLOB_RECURSE..)
X-Git-Tag: v17.1.0~1916^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=edfabf17cc87ac8079b47251fe2e8e76e17f9845;p=ceph.git

cmake: do not specify subdirectories in file(GLOB_RECURSE..)

file(GLOB_RECURSE..) does this already.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
index 5d5e6d9560df..402c8afcca2e 100644
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@ -85,23 +85,11 @@ add_npm_command(
   ${nodeenv}
 )
 
-# Glob some frontend files. With CMake 3.6, this can be simplified
-# to *.ts *.html. Just add:
-# list(FILTER frontend_src INCLUDE REGEX "frontend/src")
+# Glob some frontend files.
 file(
   GLOB_RECURSE frontend_src
   frontend/src/*.ts
-  frontend/src/*.html
-  frontend/src/*/*.ts
-  frontend/src/*/*.html
-  frontend/src/*/*/*.ts
-  frontend/src/*/*/*.html
-  frontend/src/*/*/*/*.ts
-  frontend/src/*/*/*/*.html
-  frontend/src/*/*/*/*/*.ts
-  frontend/src/*/*/*/*/*.html
-  frontend/src/*/*/*/*/*/*.ts
-  frontend/src/*/*/*/*/*/*.html)
+  frontend/src/*.html)
 
 # these files are generated during build
 list(REMOVE_ITEM frontend_src