Skip to content

Commit bb167b1

Browse files
committed
Added ae2f_Macro_Lib_V
Changes to be committed: modified: cmake/Macro.cmake
1 parent 76891b8 commit bb167b1

File tree

1 file changed

+39
-11
lines changed

1 file changed

+39
-11
lines changed

cmake/Macro.cmake

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,32 +98,60 @@ function(ae2f_Macro_cvrtdir prm_in_dir prm_in_glob prm_out_dir prm_out_ext)
9898
endforeach()
9999
endfunction()
100100

101-
function(ae2f_Macro_Lib prm_namespace prm_name prm_prefix
102-
prm_in_dir prm_in_glob
103-
prm_out_dir prm_out_ext
104-
prm_config_file prm_include_dir
105-
)
106-
file(GLOB_RECURSE files "${prm_in_dir}/${prm_in_glob}")
107-
foreach(file ${files})
108-
ae2f_Macro_cvrt(${file} ${prm_out_dir} ${prm_out_ext})
101+
function(ae2f_Macro_Lib_V prm_namespace prm_name prm_prefix
102+
prm_src_dir prm_src_glob
103+
prm_src_out_dir prm_src_out_ext
104+
105+
prm_inc_dir prm_inc_glob
106+
prm_inc_out_dir prm_inc_out_ext
107+
108+
prm_config_file prm_include_dir
109+
)
110+
111+
file(GLOB_RECURSE files-inc "${prm_inc_dir}/${prm_inc_glob}")
112+
file(GLOB_RECURSE files-src "${prm_src_dir}/${prm_src_glob}")
113+
114+
foreach(file ${files-inc})
115+
ae2f_Macro_cvrt(${file} ${prm_inc_out_dir} ${prm_inc_out_ext})
109116
endforeach()
110117

118+
foreach(file ${files-src})
119+
ae2f_Macro_cvrt(${file} ${prm_src_out_dir} ${prm_src_out_ext})
120+
endforeach()
121+
122+
111123
if(ae2f_MAC_BUILD)
112124
ae2f_CoreLibTentConfigCustom(
113125
${prm_name} ${prm_prefix} ${prm_include_dir}
114-
${prm_namespace} ${prm_config_file} ${files}
126+
${prm_namespace} ${prm_config_file} ${files-src}
115127
${ARGN}
116128
)
117129
else()
118-
file(GLOB_RECURSE ofiles "${prm_out_dir}/*${prm_out_ext}")
130+
file(GLOB_RECURSE ofiles-src "${prm_src_out_dir}/*${prm_src_out_ext}")
131+
file(GLOB_RECURSE ofiles-inc "${prm_inc_out_dir}/*${prm_inc_out_ext}")
132+
119133
ae2f_CoreLibTentConfigCustom(
120134
${prm_name} INTERFACE ${prm_include_dir}
121-
${prm_namespace} ${prm_config_file} ${ofiles}
135+
${prm_namespace} ${prm_config_file}
136+
${ofiles-src} ${ofiles-inc}
122137
${ARGN}
123138
)
124139
endif()
125140
endfunction()
126141

142+
function(ae2f_Macro_Lib prm_namespace prm_name prm_prefix
143+
prm_in_dir prm_in_glob
144+
prm_out_dir prm_out_ext
145+
prm_config_file prm_include_dir
146+
)
147+
ae2f_Macro_Lib_V(
148+
${prm_namespace} ${prm_name} ${prm_prefix}
149+
${prm_in_dir} ${prm_in_glob} ${prm_out_dir} ${prm_out_ext}
150+
${prm_in_dir} ${prm_in_glob} ${prm_out_dir} ${prm_out_ext}
151+
${prm_config_file} ${prm_include_dir}
152+
)
153+
endfunction()
154+
127155
function(ae2f_Macro_autoname prm_in)
128156
get_filename_component(path_no_ext "${prm_in}" NAME_WE)
129157
get_filename_component(ext "${prm_in}" LAST_EXT)

0 commit comments

Comments
 (0)