Skip to content

Commit 4f85841

Browse files
pcarruscagpcarruscag
authored
Merge pull request #1470 from su2code/feature_meson_build_cfd_library
Treat SU2_CFD library similar to Common in meson build process
2 parents 1567259 + 939323f commit 4f85841

4 files changed

Lines changed: 10 additions & 128 deletions

File tree

‎SU2_DEF/src/meson.build‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,9 @@
11
su2_def_src = ['SU2_DEF.cpp']
22
if get_option('enable-normal')
33

4-
su2_cfd_obj = su2_cfd_lib.extract_objects(['solvers/CSolver.cpp',
5-
'solvers/CBaselineSolver.cpp',
6-
'CMarkerProfileReaderFVM.cpp',
7-
'output/COutput.cpp',
8-
'output/tools/CWindowingTools.cpp',
9-
'output/CMeshOutput.cpp',
10-
'output/output_structure_legacy.cpp',
11-
'variables/CBaselineVariable.cpp',
12-
'variables/CVariable.cpp',
13-
'output/filewriter/CParallelDataSorter.cpp',
14-
'output/filewriter/CFVMDataSorter.cpp',
15-
'output/filewriter/CFEMDataSorter.cpp',
16-
'output/filewriter/CSurfaceFEMDataSorter.cpp',
17-
'output/filewriter/CSurfaceFVMDataSorter.cpp',
18-
'output/filewriter/CParallelFileWriter.cpp',
19-
'output/filewriter/CParaviewFileWriter.cpp',
20-
'output/filewriter/CParaviewBinaryFileWriter.cpp',
21-
'output/filewriter/CTecplotFileWriter.cpp',
22-
'output/filewriter/CTecplotBinaryFileWriter.cpp',
23-
'output/filewriter/CCSVFileWriter.cpp',
24-
'output/filewriter/CSTLFileWriter.cpp',
25-
'output/filewriter/CSU2FileWriter.cpp',
26-
'output/filewriter/CSU2BinaryFileWriter.cpp',
27-
'output/filewriter/CParaviewXMLFileWriter.cpp',
28-
'output/filewriter/CParaviewVTMFileWriter.cpp',
29-
'output/filewriter/CSU2MeshFileWriter.cpp',
30-
'output/filewriter/CCGNSFileWriter.cpp',
31-
'limiters/CLimiterDetails.cpp'])
32-
334
su2_def = executable('SU2_DEF',
34-
su2_def_src,
5+
su2_def_src,
356
install: true,
36-
dependencies: [su2_deps, common_dep],
37-
objects : su2_cfd_obj,
7+
dependencies: [su2_deps, common_dep, su2_cfd_dep],
388
cpp_args :[default_warning_flags, su2_cpp_args])
399
endif

‎SU2_DOT/src/meson.build‎

Lines changed: 5 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,21 @@
11
su2_dot_src = ['SU2_DOT.cpp']
22

33
if get_option('enable-normal')
4-
su2_cfd_obj = su2_cfd_lib.extract_objects(['solvers/CSolver.cpp',
5-
'solvers/CBaselineSolver.cpp',
6-
'CMarkerProfileReaderFVM.cpp',
7-
'output/COutput.cpp',
8-
'output/tools/CWindowingTools.cpp',
9-
'output/output_structure_legacy.cpp',
10-
'output/CBaselineOutput.cpp',
11-
'output/filewriter/CParallelDataSorter.cpp',
12-
'output/filewriter/CParallelFileWriter.cpp',
13-
'output/filewriter/CFEMDataSorter.cpp',
14-
'output/filewriter/CSurfaceFEMDataSorter.cpp',
15-
'output/filewriter/CFVMDataSorter.cpp',
16-
'output/filewriter/CSurfaceFVMDataSorter.cpp',
17-
'output/filewriter/CCSVFileWriter.cpp',
18-
'output/filewriter/CSTLFileWriter.cpp',
19-
'output/filewriter/CTecplotFileWriter.cpp',
20-
'output/filewriter/CTecplotBinaryFileWriter.cpp',
21-
'output/filewriter/CParaviewFileWriter.cpp',
22-
'output/filewriter/CParaviewBinaryFileWriter.cpp',
23-
'output/filewriter/CSU2FileWriter.cpp',
24-
'output/filewriter/CSU2BinaryFileWriter.cpp',
25-
'output/filewriter/CSU2MeshFileWriter.cpp',
26-
'output/filewriter/CParaviewXMLFileWriter.cpp',
27-
'output/filewriter/CParaviewVTMFileWriter.cpp',
28-
'output/filewriter/CCGNSFileWriter.cpp',
29-
'variables/CBaselineVariable.cpp',
30-
'variables/CVariable.cpp',
31-
'limiters/CLimiterDetails.cpp'])
4+
325
su2_dot = executable('SU2_DOT',
33-
su2_dot_src,
6+
su2_dot_src,
347
install: true,
35-
dependencies: [su2_deps, common_dep],
36-
objects : su2_cfd_obj,
8+
dependencies: [su2_deps, common_dep, su2_cfd_dep],
379
cpp_args :[default_warning_flags, su2_cpp_args])
3810

3911
endif
4012

4113
if get_option('enable-autodiff')
42-
su2_cfd_obj_ad = su2_cfd_lib_ad.extract_objects(['solvers/CSolver.cpp',
43-
'solvers/CBaselineSolver.cpp',
44-
'CMarkerProfileReaderFVM.cpp',
45-
'output/COutput.cpp',
46-
'output/tools/CWindowingTools.cpp',
47-
'output/output_structure_legacy.cpp',
48-
'output/CBaselineOutput.cpp',
49-
'output/filewriter/CParallelDataSorter.cpp',
50-
'output/filewriter/CParallelFileWriter.cpp',
51-
'output/filewriter/CFEMDataSorter.cpp',
52-
'output/filewriter/CSurfaceFEMDataSorter.cpp',
53-
'output/filewriter/CFVMDataSorter.cpp',
54-
'output/filewriter/CSurfaceFVMDataSorter.cpp',
55-
'output/filewriter/CCSVFileWriter.cpp',
56-
'output/filewriter/CSTLFileWriter.cpp',
57-
'output/filewriter/CTecplotFileWriter.cpp',
58-
'output/filewriter/CTecplotBinaryFileWriter.cpp',
59-
'output/filewriter/CParaviewFileWriter.cpp',
60-
'output/filewriter/CParaviewBinaryFileWriter.cpp',
61-
'output/filewriter/CSU2FileWriter.cpp',
62-
'output/filewriter/CSU2BinaryFileWriter.cpp',
63-
'output/filewriter/CSU2MeshFileWriter.cpp',
64-
'output/filewriter/CParaviewXMLFileWriter.cpp',
65-
'output/filewriter/CParaviewVTMFileWriter.cpp',
66-
'output/filewriter/CCGNSFileWriter.cpp',
67-
'variables/CBaselineVariable.cpp',
68-
'variables/CVariable.cpp',
69-
'limiters/CLimiterDetails.cpp'])
7014

7115
su2_dot_ad = executable('SU2_DOT_AD',
7216
su2_dot_src,
7317
install: true,
74-
dependencies: [su2_deps, codi_dep, commonAD_dep],
75-
objects : su2_cfd_obj_ad,
76-
cpp_args : [default_warning_flags, su2_cpp_args, codi_rev_args])
18+
dependencies: [su2_deps, codi_dep, commonAD_dep, su2_cfd_dep_ad],
19+
cpp_args : [default_warning_flags, su2_cpp_args, codi_rev_args])
7720

7821
endif

‎SU2_GEO/src/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ su2_geo_src = ['SU2_GEO.cpp']
22

33
if get_option('enable-normal')
44
su2_geo = executable('SU2_GEO',
5-
su2_geo_src,
5+
su2_geo_src,
66
install: true,
77
dependencies: [su2_deps, common_dep],
88
cpp_args : [default_warning_flags, su2_cpp_args])

‎SU2_SOL/src/meson.build‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,10 @@
11
su2_sol_src = ['SU2_SOL.cpp']
22
if get_option('enable-normal')
3-
su2_cfd_obj = su2_cfd_lib.extract_objects(['solvers/CSolver.cpp',
4-
'solvers/CBaselineSolver.cpp',
5-
'solvers/CBaselineSolver_FEM.cpp',
6-
'CMarkerProfileReaderFVM.cpp',
7-
'output/COutput.cpp',
8-
'output/output_structure_legacy.cpp',
9-
'output/tools/CWindowingTools.cpp',
10-
'output/CBaselineOutput.cpp',
11-
'output/filewriter/CParallelDataSorter.cpp',
12-
'output/filewriter/CParallelFileWriter.cpp',
13-
'output/filewriter/CFEMDataSorter.cpp',
14-
'output/filewriter/CSurfaceFEMDataSorter.cpp',
15-
'output/filewriter/CFVMDataSorter.cpp',
16-
'output/filewriter/CSurfaceFVMDataSorter.cpp',
17-
'output/filewriter/CCSVFileWriter.cpp',
18-
'output/filewriter/CSTLFileWriter.cpp',
19-
'output/filewriter/CTecplotFileWriter.cpp',
20-
'output/filewriter/CTecplotBinaryFileWriter.cpp',
21-
'output/filewriter/CParaviewFileWriter.cpp',
22-
'output/filewriter/CParaviewBinaryFileWriter.cpp',
23-
'output/filewriter/CSU2FileWriter.cpp',
24-
'output/filewriter/CSU2BinaryFileWriter.cpp',
25-
'output/filewriter/CSU2MeshFileWriter.cpp',
26-
'output/filewriter/CParaviewXMLFileWriter.cpp',
27-
'output/filewriter/CParaviewVTMFileWriter.cpp',
28-
'output/filewriter/CCGNSFileWriter.cpp',
29-
'variables/CBaselineVariable.cpp',
30-
'variables/CVariable.cpp',
31-
'limiters/CLimiterDetails.cpp'])
323

334
su2_sol = executable('SU2_SOL',
34-
su2_sol_src,
5+
su2_sol_src,
356
install: true,
36-
dependencies: [su2_deps, common_dep],
37-
objects : su2_cfd_obj,
7+
dependencies: [su2_deps, common_dep, su2_cfd_dep],
388
cpp_args :[default_warning_flags, su2_cpp_args])
399

40-
4110
endif

0 commit comments

Comments
 (0)