cmake: force MSVC compiler charset to utf-8 #9989
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slaren
reviewed
Nov 16, 2024
CMakeLists.txt
Outdated
| @@ -46,6 +46,13 @@ if (WIN32) | |||
| add_compile_definitions(_CRT_SECURE_NO_WARNINGS) | |||
| endif() | |||
|
|
|||
| if (NOT GGML_CUDA) | |||
There was a problem hiding this comment.
What is the reason for disabling this with GGML_CUDA? Shouldn't these changes only apply to C/C++ sources anyway?
There was a problem hiding this comment.
It's because these changes will cause cuda failed to build.
There was a problem hiding this comment.
Does this work?
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
add_compile_options("$<$<COMPILE_LANGUAGE:C>:/source-charset:utf-8>")
add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/source-charset:utf-8>")
add_compile_options("$<$<COMPILE_LANGUAGE:C>:/execution-charset:utf-8>")
add_compile_options("$<$<COMPILE_LANGUAGE:CX>:/execution-charset:utf-8>")
endif()
slaren
approved these changes
Nov 19, 2024
arthw
pushed a commit
to arthw/llama.cpp
that referenced
this pull request
Dec 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit is to prevent
tests\test-grammar-integration.cpp(483,13): error C2001: newline in constantshowing up in non-UTF8 windows system while using MSVC.