diff --git a/CMakeLists.txt b/CMakeLists.txt
index 830b615c..4f3af58f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -665,7 +665,7 @@ elseif(APPLE)
find_package(Boost 1.79.0 REQUIRED)
else()
# Note that header-only libraries don't have a component
- find_package(Boost 1.79.0 REQUIRED COMPONENTS stacktrace_backtrace)
+ find_package(Boost REQUIRED)
endif()
include_directories(${Boost_INCLUDE_DIRS})
# Uncomment the next two lines if you want to find where Boost headers and DLLs are on your system
diff --git a/meson.build b/meson.build
index f7dc861b..594fdeed 100644
--- a/meson.build
+++ b/meson.build
@@ -406,13 +406,8 @@ qtTestRunnerDependencies = dependency('qt5', version : '>=5.9.5', modules: ['Tes
# For Boost, per https://mesonbuild.com/Dependencies.html#boost, we only need to supply module names for libraries we
# need to link against. For the header-only Boost libraries, the 'boost' dependency suffices.
boostModules = []
-if host_machine.system() == 'linux'
- boostModules += 'stacktrace_backtrace'
- add_global_arguments('-DBOOST_STACKTRACE_LINK', language : 'cpp')
- add_global_arguments('-DBOOST_STACKTRACE_USE_BACKTRACE', language : 'cpp')
-endif
boostDependency = dependency('boost',
- version : '>=1.79.0',
+ version : '>=1.78.0',
modules : boostModules,
static : true)
message('Boost:', boostDependency.name(), 'found =', boostDependency.found(), 'version =', boostDependency.version())
@@ -468,12 +463,12 @@ endif
# Note that, unlike, say, the parameters to include_directories(), the dirs argument to find_library() must be absolute
# paths
-libbacktraceDir = join_paths(meson.project_source_root(), 'third-party/libbacktrace/.libs')
-backtraceDependency = compiler.find_library('backtrace',
- required : true,
- static : true,
- dirs : [libbacktraceDir])
-
+#libbacktraceDir = join_paths(meson.project_source_root(), 'third-party/libbacktrace/.libs')
+#backtraceDependency = compiler.find_library('backtrace',
+# required : true,
+# static : true,
+# dirs : [libbacktraceDir])
+#
#======================================== Find the other libraries we depend on ========================================
#
# See https://mesonbuild.com/Reference-manual_returned_dep.html for what info we can pull from a dependency object
@@ -1086,9 +1081,9 @@ generatedFromMocForUnitTests = qt.compile_moc(headers : unitTestMocHeaders,
#
# We make a point here of displaying the output of run_command because we want to show message emitted by lupdate about
# what it did.
-message('Running lupdate on the following ts files:', run_command('ls', translationSourceFiles, check: true).stdout())
+message('Running lupdate-qt5 on the following ts files:', run_command('ls', translationSourceFiles, check: true).stdout())
message(
- run_command('lupdate',
+ run_command('lupdate-qt5',
meson.project_source_root() + '/src',
meson.project_source_root() + '/ui',
'-ts',
@@ -1110,8 +1105,7 @@ commonDependencies = [qtCommonDependencies,
xercesDependency,
xalanDependency,
boostDependency,
- dlDependency,
- backtraceDependency]
+ dlDependency]
mainExeDependencies = commonDependencies + qtMainExeDependencies
testRunnerDependencies = commonDependencies + qtTestRunnerDependencies