Skip to content

Commit d441a90

Browse files
committed
build: update dependencies to gsl-lite/0.42.0, ms-gsl/4.1.0, fmt/11.1.4, and catch2/3.8.0, and suppress warnings for gcc-12
1 parent 4624367 commit d441a90

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,17 +209,17 @@ def configure(self):
209209
def requirements(self):
210210
if not self.options.freestanding:
211211
if self.options.contracts == "gsl-lite":
212-
self.requires("gsl-lite/0.41.0", transitive_headers=True)
212+
self.requires("gsl-lite/0.42.0", transitive_headers=True)
213213
elif self.options.contracts == "ms-gsl":
214-
self.requires("ms-gsl/4.0.0", transitive_headers=True)
214+
self.requires("ms-gsl/4.1.0", transitive_headers=True)
215215
if not self.options.std_format:
216-
self.requires("fmt/11.1.1", transitive_headers=True)
216+
self.requires("fmt/11.1.4", transitive_headers=True)
217217

218218
def build_requirements(self):
219219
self.tool_requires("cmake/[>=3.31 <4]")
220220
if self._build_all:
221221
if not self.options.freestanding:
222-
self.test_requires("catch2/3.7.0")
222+
self.test_requires("catch2/3.8.0")
223223
if not self._skip_la:
224224
self.test_requires("wg21-linear_algebra/0.7.3")
225225

src/core/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION
163163
target_compile_options(mp-units-core ${${projectPrefix}TARGET_SCOPE} "-Wno-unused-result")
164164
endif()
165165

166+
# usage of uninitialized variable in c++/12/bits/char_traits.h
167+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
168+
target_compile_options(mp-units-core ${${projectPrefix}TARGET_SCOPE} "-Wno-maybe-uninitialized")
169+
endif()
170+
166171
# time-trace
167172
if(${projectPrefix}DEV_TIME_TRACE STREQUAL "ALL")
168173
target_compile_options(mp-units-core ${${projectPrefix}TARGET_SCOPE} "-ftime-trace")

0 commit comments

Comments
 (0)