Skip to content

Commit 3e5ede6

Browse files
committed
Change files outside of third_party/fmt
1 parent e9a97de commit 3e5ede6

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Thumbs.db
4747
/test/data/ch
4848
/test/data/mld
4949
/cmake/postinst
50+
.gradle/
5051

5152
# Eclipse related files #
5253
#########################

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Unreleased
22
- Changes from 6.0.0
33
- Misc:
4+
- CHANGED: Update fmt library to version 11.2.0 [#7238](https://github.com/Project-OSRM/osrm-backend/issues/7238)
45
- ADDED: Add husky pre-commit hook for compiling and linting staged JS files [#7228](https://github.com/Project-OSRM/osrm-backend/issues/7228)
56
- CHANGED: Standardize linting configuration with ESM-specific rules [#7229](https://github.com/Project-OSRM/osrm-backend/issues/7229)
67
- CHANGED: Convert scripts from CommonJS to modern ESM format [#7230](https://github.com/Project-OSRM/osrm-backend/pull/7230)

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
268268
# using Visual Studio C++
269269
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp
270270
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h
271+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8") # support Unicode in fmt library
271272
add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
272273
add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
273274
add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation

scripts/update_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ VTZERO_PATH="mapbox/vtzero"
2828
VTZERO_TAG=v1.1.0
2929

3030
FMT_PATH="fmtlib/fmt"
31-
FMT_TAG=v10.2.1
31+
FMT_TAG=11.2.0
3232

3333
FLATBUFFERS_PATH="google/flatbuffers"
3434
FLATBUFFERS_TAG=v24.3.25

0 commit comments

Comments
 (0)