vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMakeLists: base std::variantC++17, specificTest std::formatC++20

Browse source
This commit is contained in:
HanishKVC 2024-05-15 12:56:05 +05:30
parent 4a15989000
commit dc03a7134a
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -837,7 +837,7 @@ function(get_flags CCID CCVER)
set(GF_CXX_FLAGS ${CXX_FLAGS} PARENT_SCOPE) set(GF_CXX_FLAGS ${CXX_FLAGS} PARENT_SCOPE)
endfunction() endfunction()
list(APPEND CXX_FLAGS -std=c++20) list(APPEND CXX_FLAGS -std=c++17)
if (LLAMA_FATAL_WARNINGS) if (LLAMA_FATAL_WARNINGS)
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

3
tests/CMakeLists.txt
View file

@ -119,6 +119,9 @@ llama_target_and_test(test-chat-template.cpp)
llama_target_and_test(test-chat-template-chaton.cpp) llama_target_and_test(test-chat-template-chaton.cpp)
llama_target_and_test(test-chaton-groupkv.cpp) llama_target_and_test(test-chaton-groupkv.cpp)
llama_target_and_test(test-chaton-simpcfg.cpp) llama_target_and_test(test-chaton-simpcfg.cpp)
#target_compile_features(test-chaton-simpcfg PUBLIC cxx_std_20)
target_compile_options(test-chaton-simpcfg PUBLIC -std=c++20)
llama_target_and_test(test-grammar-parser.cpp) llama_target_and_test(test-grammar-parser.cpp)
llama_target_and_test(test-llama-grammar.cpp) llama_target_and_test(test-llama-grammar.cpp)