Skip to content

Commit

Permalink
ignore new fast_double_parser files, fix fmt compile errors with MSVC
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed Jan 27, 2025
1 parent 44fcc87 commit e15bb5d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ include_directories(${FAST_DOUBLE_PARSER_INCLUDE_DIR})
set(FMT_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/external_libs/fmt/include")
include_directories(${FMT_INCLUDE_DIR})

# on MSVC: "Unicode support requires compiling with /utf-8"
target_compile_options(fmt::fmt
PUBLIC $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>
)

if(__BUILD_FOR_R)
find_package(LibR REQUIRED)
message(STATUS "LIBR_EXECUTABLE: ${LIBR_EXECUTABLE}")
Expand Down
1 change: 1 addition & 0 deletions R-package/.Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ AUTOCONF_UBUNTU_VERSION
^.*\.bin
^build_r.R$
\.clang-format
^.*\.clusterfuzzlite$
^cran-comments\.md$
^docs$
^.*\.dll
Expand Down

0 comments on commit e15bb5d

Please sign in to comment.