meson: move c(xx)flags configuration
Group the c(xx)flags configuration nearer to the top, where it will be
grouped with additional compiler configuration in a subsequent patch.
Tested by building and running the unit tests.
Change-Id: Ib2186e4756774b22ff507ce225c350e828b1e5c4
Signed-off-by: Brad Bishop <bradbish@qti.qualcomm.com>
diff --git a/meson.build b/meson.build
index 838d8aa..9cb3e69 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,17 @@
version: '1.0',
)
+# Enable debugging for debug builds
+if get_option('buildtype').startswith('debug')
+ add_project_arguments('-DMAPPER_ENABLE_DEBUG', language: 'cpp')
+endif
+
+# Boost configuration
+add_project_arguments(
+ ['-DBOOST_ASIO_DISABLE_THREADS', '-DBOOST_ASIO_NO_DEPRECATED'],
+ language: 'cpp',
+)
+
cli11 = dependency('CLI11', required: false, include_type: 'system')
if not cli11.found()
cli11_proj = subproject('cli11', required: true)
@@ -43,14 +54,6 @@
endforeach
boost = declare_dependency(dependencies: boost_deps)
endif
-add_project_arguments(
- ['-DBOOST_ASIO_DISABLE_THREADS', '-DBOOST_ASIO_NO_DEPRECATED'],
- language: 'cpp',
-)
-
-if get_option('buildtype').startswith('debug')
- add_project_arguments('-DMAPPER_ENABLE_DEBUG', language: 'cpp')
-endif
if get_option('tests').allowed()
gtest = dependency(