File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -136,8 +136,6 @@ set_target_properties(${TARGET} PROPERTIES
136136target_include_directories (${TARGET} PUBLIC . )
137137target_link_libraries (${TARGET} PUBLIC vendor::nlohmann vendor::sheredom )
138138target_compile_features (${TARGET} PUBLIC cxx_std_17 )
139- target_precompile_headers (${TARGET} PRIVATE common.h )
140- target_precompile_headers (${TARGET} PRIVATE chat.h )
141139
142140if (LLAMA_SUBPROCESS)
143141 target_compile_definitions (${TARGET} PUBLIC LLAMA_SUBPROCESS )
Original file line number Diff line number Diff line change @@ -67,7 +67,6 @@ configure_file(llama-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/llama-version.h @O
6767target_include_directories (llama PRIVATE . ${CMAKE_CURRENT_BINARY_DIR } )
6868target_include_directories (llama PUBLIC ../include )
6969target_compile_features (llama PRIVATE cxx_std_17 ) # don't bump
70- target_precompile_headers (llama PRIVATE models/models.h )
7170
7271target_link_libraries (llama PUBLIC ggml )
7372
Original file line number Diff line number Diff line change @@ -275,8 +275,6 @@ llama_build_and_test(
275275 peg-parser/test-unicode.cpp
276276 peg-parser/tests.h
277277)
278- target_precompile_headers (test -peg-parser PRIVATE peg-parser/tests.h )
279-
280278
281279if (NOT ${CMAKE_SYSTEM_PROCESSOR } MATCHES "s390x" )
282280 set (MODEL_NAME "tinyllamas/stories15M-q4_0.gguf" )
Original file line number Diff line number Diff line change @@ -84,13 +84,6 @@ target_link_libraries (mtmd PUBLIC ggml llama)
8484target_link_libraries (mtmd PRIVATE Threads::Threads vendor::hash vendor::miniaudio vendor::stb vendor::sheredom )
8585target_include_directories (mtmd PUBLIC . )
8686target_compile_features (mtmd PRIVATE cxx_std_17 )
87- target_precompile_headers (mtmd PRIVATE models/models.h )
88-
89- set_source_files_properties (
90- mtmd-helper.cpp
91- mtmd-helper-gen.cpp
92- PROPERTIES SKIP_PRECOMPILE_HEADERS ON
93- )
9487
9588if (MTMD_VIDEO)
9689 target_compile_definitions (mtmd PRIVATE MTMD_VIDEO )
Original file line number Diff line number Diff line change 11include_directories (${CMAKE_CURRENT_SOURCE_DIR } ${CMAKE_CURRENT_BINARY_DIR } )
22
3- # MSVC emits a PCH bookkeeping symbol that WINDOWS_EXPORT_ALL_SYMBOLS exports as an ambiguous "__"
4-
5- set (LLAMA_SERVER_PCH ON )
6-
7- if (BUILD_SHARED_LIBS AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" )
8- set (LLAMA_SERVER_PCH OFF )
9- endif ()
10-
113# server-context containing the core server logic, used by llama-server and CLI
124
135set (TARGET server-context)
@@ -41,10 +33,6 @@ target_include_directories(${TARGET} PRIVATE ../mtmd)
4133target_include_directories (${TARGET} PRIVATE ${CMAKE_SOURCE_DIR } )
4234target_link_libraries (${TARGET} PUBLIC llama-common mtmd ${CMAKE_THREAD_LIBS_INIT} )
4335
44- if (LLAMA_SERVER_PCH)
45- target_precompile_headers (${TARGET} PRIVATE ${CMAKE_SOURCE_DIR } /common/common.h )
46- endif ()
47-
4836# llama-server-impl: server logic, reusable by app
4937
5038set (TARGET llama-server-impl)
@@ -62,10 +50,6 @@ target_include_directories(${TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
6250target_include_directories (${TARGET} PRIVATE ../mtmd ${CMAKE_SOURCE_DIR } )
6351target_link_libraries (${TARGET} PUBLIC server-context llama-ui cpp-httplib ${CMAKE_THREAD_LIBS_INIT} )
6452
65- if (LLAMA_SERVER_PCH)
66- target_precompile_headers (${TARGET} PRIVATE ${CMAKE_SOURCE_DIR } /common/common.h )
67- endif ()
68-
6953add_dependencies (${TARGET} llama-ui-assets )
7054
7155if (LLAMA_TOOLS_INSTALL)
You can’t perform that action at this time.
0 commit comments