tboudreaux/liblogging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into feature/mixedPolytrope

Browse Source 
# Conflicts:
#	.gitignore
#	build-config/meson.build
#	meson.build
#	meson_options.txt
#	src/composition/public/composition.h
#	src/config/public/config.h
#	src/constants/public/const.h
#	src/meson.build
#	tests/composition_sandbox/comp.cpp
This commit is contained in:
Emily Boudreaux
2025-06-11 15:05:11 -04:00
parent 42949d58c7 8b06263d8f
commit 603cd9c1f6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build-config/quill/meson.build
View File

@@ -1,5 +1,10 @@
quill_cmake_options = cmake.subproject_options()
quill_cmake_options.add_cmake_defines({
'BUILD_SHARED_LIBS': 'ON',
'CMAKE_SKIP_INSTALL_RULES': 'ON'
})
quill_sp = cmake.subproject( quill_sp = cmake.subproject(
'quill' 'quill',
options: quill_cmake_options,
) )
quill_dep = quill_sp.dependency('quill') quill_dep = quill_sp.dependency('quill')
add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/quill/__CMake_build', language: 'cpp')

2
src/probe/meson.build
View File

@@ -35,7 +35,7 @@ dependencies = [
] ]
# Define the liblogger library so it can be linked against by other parts of the build system # Define the liblogger library so it can be linked against by other parts of the build system
libprobe = static_library('probe', libprobe = library('probe',
probe_sources, probe_sources,
include_directories: include_directories('public'), include_directories: include_directories('public'),
cpp_args: ['-fvisibility=default'], cpp_args: ['-fvisibility=default'],