Skip to content

Commit ca778ac

Browse files
Made it consistent with other flags and added consistent formatting
1 parent 382c653 commit ca778ac

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Common/include/tracy_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#pragma once
3434

35-
#ifdef TRACY_ENABLE
35+
#ifdef HAVE_TRACY
3636
# include "tracy/Tracy.hpp"
3737
# define SU2_ZONE_SCOPED ZoneScoped
3838
# define SU2_ZONE_SCOPED_N(name) ZoneScopedN(name)

meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project('SU2', 'c', 'cpp',
77
'warning_level=0',
88
'c_std=c99',
99
'cpp_std=c++17',
10-
'tracy_enable=false'])
10+
'enable_tracy=false'])
1111

1212
fsmod = import('fs')
1313
if not fsmod.exists('su2preconfig.timestamp')
@@ -114,10 +114,10 @@ if get_option('enable-autodiff') and not omp
114114
endif
115115

116116
# Add Tracy dependency if enabled
117-
if get_option('tracy_enable')
117+
if get_option('enable_tracy')
118118
tracy_dep = dependency('tracy', static: true)
119119
su2_deps += tracy_dep
120-
su2_cpp_args += '-DTRACY_ENABLE'
120+
su2_cpp_args += '-DHAVE_TRACY'
121121

122122
# Add build type check
123123
if get_option('buildtype') != 'debugoptimized'
@@ -391,7 +391,7 @@ message('''---------------------------------------------------------------------
391391
'''.format(get_option('prefix')+'/bin', meson.project_source_root(), get_option('enable-tecio'), get_option('enable-cgns'),
392392
get_option('enable-autodiff'), get_option('enable-directdiff'), get_option('enable-pywrapper'), get_option('enable-mkl'),
393393
get_option('enable-openblas'), get_option('enable-pastix'), get_option('enable-mixedprec'), get_option('enable-librom'), get_option('enable-coolprop'),
394-
get_option('enable-mlpcpp'), get_option('tracy_enable'), meson.project_build_root().startswith(meson.project_source_root()) ? meson.project_build_root().split('/')[-1] : meson.project_build_root()))
394+
get_option('enable-mlpcpp'), get_option('enable_tracy'), meson.project_build_root().startswith(meson.project_source_root()) ? meson.project_build_root().split('/')[-1] : meson.project_build_root()))
395395

396396
if get_option('enable-mpp')
397397
if get_option('install-mpp')

meson_options.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,4 @@ option('opdi-shared-read-opt', type : 'boolean', value : true, description : 'Op
2929
option('librom_root', type : 'string', value : '', description: 'libROM base directory')
3030
option('enable-librom', type : 'boolean', value : false, description: 'enable LLNL libROM support')
3131
option('static-cgns-deps', type : 'boolean', value : false, description: 'prefer static or dynamic (default) libraries for CGNS dependencies')
32-
option('tracy_enable',
33-
type: 'boolean',
34-
value: false,
35-
description: 'Enable Tracy profiling support')
32+
option('enable_tracy', type: 'boolean', value: false, description: 'Enable Tracy profiling support')

0 commit comments

Comments
 (0)