Update CMakeLists.txt
replace tabs with spaces
This commit is contained in:
parent
786b6a9a3f
commit
2c2671d2c8
1 changed files with 7 additions and 3 deletions
|
@ -4,10 +4,14 @@ option(LLAMA_SERVER_SSL "Build SSL support for the server" OFF)
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
|
||||||
|
endif(MSVC)
|
||||||
|
|
||||||
macro(get_WIN32_WINNT version)
|
macro(get_WIN32_WINNT version)
|
||||||
if (WIN32 AND CMAKE_SYSTEM_VERSION)
|
if (WIN32 AND CMAKE_SYSTEM_VERSION)
|
||||||
set(ver ${CMAKE_SYSTEM_VERSION})
|
set(ver ${CMAKE_SYSTEM_VERSION})
|
||||||
string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
|
string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
|
||||||
string(REPLACE "." "" ver ${ver})
|
string(REPLACE "." "" ver ${ver})
|
||||||
string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
|
string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
|
||||||
set(${version} "0x${ver}")
|
set(${version} "0x${ver}")
|
||||||
|
@ -19,8 +23,8 @@ get_WIN32_WINNT(ver)
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
# fix: https://github.com/ggerganov/llama.cpp/actions/runs/9651004652/job/26617901362?pr=8006
|
# fix: https://github.com/ggerganov/llama.cpp/actions/runs/9651004652/job/26617901362?pr=8006
|
||||||
# add_compile_definitions(_WIN32_WINNT=${GGML_WIN_VER})
|
# add_compile_definitions(_WIN32_WINNT=${GGML_WIN_VER})
|
||||||
add_definitions(-D_WIN32_WINNT=${ver})
|
add_definitions(-D_WIN32_WINNT=${ver})
|
||||||
message(STATUS "MinGW detected, setting _WIN32_WINNT to ${ver}")
|
message(STATUS "MinGW detected, setting _WIN32_WINNT to ${ver}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(TARGET_SRCS
|
set(TARGET_SRCS
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue