Skip to content

Commit f2404ac

Browse files
akosthekissrobertsipka
authored andcommitted
Simplify the collection of sources in cmake files (#2673)
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
1 parent af91072 commit f2404ac

File tree

2 files changed

+20
-40
lines changed

2 files changed

+20
-40
lines changed

jerry-core/CMakeLists.txt

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,34 +118,20 @@ set(INCLUDE_CORE_PRIVATE ${INCLUDE_CORE_PRIVATE} PARENT_SCOPE) # for tests/unit-
118118

119119
# Sources
120120
# Jerry core
121-
file(GLOB SOURCE_CORE_API api/*.c)
122-
file(GLOB SOURCE_CORE_DEBUGGER debugger/*.c)
123-
file(GLOB SOURCE_CORE_ECMA_BASE ecma/base/*.c)
124-
file(GLOB SOURCE_CORE_ECMA_BUILTINS ecma/builtin-objects/*.c)
125-
file(GLOB SOURCE_CORE_ECMA_BUILTINS_TYPEDARRAY ecma/builtin-objects/typedarray/*.c)
126-
file(GLOB SOURCE_CORE_ECMA_OPERATIONS ecma/operations/*.c)
127-
file(GLOB SOURCE_CORE_JCONTEXT jcontext/*.c)
128-
file(GLOB SOURCE_CORE_JMEM jmem/*.c)
129-
file(GLOB SOURCE_CORE_JRT jrt/*.c)
130-
file(GLOB SOURCE_CORE_LIT lit/*.c)
131-
file(GLOB SOURCE_CORE_PARSER_JS parser/js/*.c)
132-
file(GLOB SOURCE_CORE_PARSER_REGEXP parser/regexp/*.c)
133-
file(GLOB SOURCE_CORE_VM vm/*.c)
134-
135-
set(SOURCE_CORE_FILES
136-
${SOURCE_CORE_API}
137-
${SOURCE_CORE_DEBUGGER}
138-
${SOURCE_CORE_ECMA_BASE}
139-
${SOURCE_CORE_ECMA_BUILTINS}
140-
${SOURCE_CORE_ECMA_BUILTINS_TYPEDARRAY}
141-
${SOURCE_CORE_ECMA_OPERATIONS}
142-
${SOURCE_CORE_JCONTEXT}
143-
${SOURCE_CORE_JMEM}
144-
${SOURCE_CORE_JRT}
145-
${SOURCE_CORE_LIT}
146-
${SOURCE_CORE_PARSER_JS}
147-
${SOURCE_CORE_PARSER_REGEXP}
148-
${SOURCE_CORE_VM})
121+
file(GLOB SOURCE_CORE_FILES
122+
api/*.c
123+
debugger/*.c
124+
ecma/base/*.c
125+
ecma/builtin-objects/*.c
126+
ecma/builtin-objects/typedarray/*.c
127+
ecma/operations/*.c
128+
jcontext/*.c
129+
jmem/*.c
130+
jrt/*.c
131+
lit/*.c
132+
parser/js/*.c
133+
parser/regexp/*.c
134+
vm/*.c)
149135

150136
# All-in-one build
151137
if(ENABLE_ALL_IN_ONE)

jerry-ext/CMakeLists.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,12 @@ if(FEATURE_INIT_FINI)
3333
endif()
3434

3535
# Source directories
36-
file(GLOB SOURCE_EXT_ARG arg/*.c)
37-
file(GLOB SOURCE_EXT_COMMON common/*.c)
38-
file(GLOB SOURCE_EXT_DEBUGGER debugger/*.c)
39-
file(GLOB SOURCE_EXT_HANDLER handler/*.c)
40-
file(GLOB SOURCE_EXT_MODULE module/*.c)
41-
42-
set(SOURCE_EXT
43-
${SOURCE_EXT_ARG}
44-
${SOURCE_EXT_COMMON}
45-
${SOURCE_EXT_DEBUGGER}
46-
${SOURCE_EXT_HANDLER}
47-
${SOURCE_EXT_MODULE})
36+
file(GLOB SOURCE_EXT
37+
arg/*.c
38+
common/*.c
39+
debugger/*.c
40+
handler/*.c
41+
module/*.c)
4842

4943
add_library(${JERRY_EXT_NAME} ${SOURCE_EXT})
5044

0 commit comments

Comments
 (0)