Skip to content

Commit 2a82511

Browse files
authored
cmake : fix for builds without GGML_CDEF_PUBLIC (#9338)
* `GGML_TARGET_DEFINES-NOTFOUND` fix for builds without `GGML_CDEF_PUBLIC` * Update CMakeLists.txt, spaces fix
1 parent 4dc4f5f commit 2a82511

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,16 @@ set(LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location o
139139
# determining _precisely_ which defines are necessary for the llama-config
140140
# package.
141141
#
142+
set(GGML_TRANSIENT_DEFINES)
142143
get_target_property(GGML_DIRECTORY ggml SOURCE_DIR)
143144
get_directory_property(GGML_DIR_DEFINES DIRECTORY ${GGML_DIRECTORY} COMPILE_DEFINITIONS)
145+
if (GGML_DIR_DEFINES)
146+
list(APPEND GGML_TRANSIENT_DEFINES ${GGML_DIR_DEFINES})
147+
endif()
144148
get_target_property(GGML_TARGET_DEFINES ggml COMPILE_DEFINITIONS)
145-
set(GGML_TRANSIENT_DEFINES ${GGML_TARGET_DEFINES} ${GGML_DIR_DEFINES})
149+
if (GGML_TARGET_DEFINES)
150+
list(APPEND GGML_TRANSIENT_DEFINES ${GGML_TARGET_DEFINES})
151+
endif()
146152
get_target_property(GGML_LINK_LIBRARIES ggml LINK_LIBRARIES)
147153

148154
set_target_properties(llama PROPERTIES PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/llama.h)

0 commit comments

Comments
 (0)