Skip to content

Commit

Permalink
Merge branch 'origin/lvengesanam/resolve_build_issue' into 'main'
Browse files Browse the repository at this point in the history
Including subdir 'test' in meson.build only while building unit_tests

See merge request lightspeedrtx/bridge-remix-nv!37
  • Loading branch information
lvengesanam committed Aug 25, 2023
2 parents 4a0203f + 0da901d commit 9833d09
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build_common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ function PerformBuild {

Push-Location $CurrentDir
$mesonArgs = "setup --buildtype `"$BuildFlavour`" --backend `"$Backend`" `"$BuildSubDir`" --debug"
if ( $BuildTarget ) {
$mesonArgs += " -Denable_tests=`"$true`""
}
Start-Process "meson" -ArgumentList $mesonArgs -wait
Pop-Location

Expand Down
7 changes: 6 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,9 @@ bridge_version = vcs_tag(
output: 'version.h')

subdir('src')
subdir('test')

enable_tests = get_option('enable_tests')

if enable_tests
subdir('test')
endif
1 change: 1 addition & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
option('enable_tests', type : 'boolean', value : false)
option('enable_tracy', type : 'boolean', value : false, description: 'Enable Tracy profiler support')

option('tracy_on_demand', type : 'boolean', value : false, description : 'On-demand profiling')
Expand Down

0 comments on commit 9833d09

Please sign in to comment.