Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
CC: "ccache gcc"
CXX: "ccache g++"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false -Db_pch=false build

- name: Configure for AppImage
if: ${{inputs.upload_artefacts}}
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson setup --cross-file=${{steps.osxcross.outputs.meson-osxcross}} --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
meson setup --cross-file=${{steps.osxcross.outputs.meson-osxcross}} --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false -Db_pch=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:

- name: Setup
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} --vsenv build
meson setup -Db_pch=false --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} --vsenv build

- name: Build
run: |
Expand Down
7 changes: 1 addition & 6 deletions Source/meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@

if use_pch
pch = meson.current_source_dir()/'System/StandardIncludes.h'
else
pch = ''
endif
pch = meson.current_source_dir()/'System/StandardIncludes.h'
sources = []
source_libs = []
source_inc_dirs += [include_directories(
Expand Down
13 changes: 0 additions & 13 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,6 @@ if get_option('debug') and get_option('b_lto')
warning('Link time optimization enabled in debug mode, debug symbols may not be fully available. Disable b_lto with "meson configure -Db_lto=false".')
endif

use_pch = get_option('use_pch').enabled()

if get_option('use_pch').auto()
ccache = find_program('ccache', required : false)
if ccache.found()
message('Detected ccache, disabling precompiled headers')
use_pch = false
else
message('Using precompiled headers')
use_pch = true
endif
endif

if compiler.get_argument_syntax()== 'gcc' # used for gcc compatible compilers
# Build against system libraries on linux
message('gcc detected')
Expand Down
2 changes: 0 additions & 2 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@ option('tracy_enable', type: 'boolean', value: true, description: 'Enable Tracy
option('tracy_callstack', type : 'integer', value : 0, description : 'Enfore callstack collection for tracy regions')
option('tracy_on_demand', type : 'boolean', value : true, description : 'On-demand profiling')
option('tracy_debuginfod', type : 'boolean', value : false, description : 'Enable debuginfod support')

option('use_pch', type : 'feature', value : 'auto')