ggerganov commited on
Commit
9615cf2
·
1 Parent(s): b788516

ggml : do not install metal source when embed library (ggml/1054)

Browse files
ggml/CMakeLists.txt CHANGED
@@ -252,26 +252,6 @@ set_target_properties(ggml PROPERTIES PUBLIC_HEADER "${GGML_PUBLIC_HEADERS}")
252
  install(TARGETS ggml LIBRARY PUBLIC_HEADER)
253
  install(TARGETS ggml-base LIBRARY)
254
 
255
- # FIXME: this should be done in the backend cmake files
256
- if (GGML_METAL)
257
- # FIXME: does this need to be installed with GGML_METAL_EMBED_LIBRARY?
258
- install(
259
- FILES src/ggml-metal/ggml-metal.metal
260
- PERMISSIONS
261
- OWNER_READ
262
- OWNER_WRITE
263
- GROUP_READ
264
- WORLD_READ
265
- DESTINATION ${CMAKE_INSTALL_BINDIR})
266
-
267
- if (NOT GGML_METAL_EMBED_LIBRARY)
268
- install(
269
- FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
270
- DESTINATION ${CMAKE_INSTALL_BINDIR}
271
- )
272
- endif()
273
- endif()
274
-
275
  if (GGML_STANDALONE)
276
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ggml.pc.in
277
  ${CMAKE_CURRENT_BINARY_DIR}/ggml.pc
 
252
  install(TARGETS ggml LIBRARY PUBLIC_HEADER)
253
  install(TARGETS ggml-base LIBRARY)
254
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
255
  if (GGML_STANDALONE)
256
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ggml.pc.in
257
  ${CMAKE_CURRENT_BINARY_DIR}/ggml.pc
ggml/src/ggml-metal/CMakeLists.txt CHANGED
@@ -103,3 +103,19 @@ else()
103
  DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
104
  )
105
  endif() # GGML_METAL_EMBED_LIBRARY
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
103
  DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
104
  )
105
  endif() # GGML_METAL_EMBED_LIBRARY
106
+
107
+ if (NOT GGML_METAL_EMBED_LIBRARY)
108
+ install(
109
+ FILES src/ggml-metal/ggml-metal.metal
110
+ PERMISSIONS
111
+ OWNER_READ
112
+ OWNER_WRITE
113
+ GROUP_READ
114
+ WORLD_READ
115
+ DESTINATION ${CMAKE_INSTALL_BINDIR})
116
+
117
+ install(
118
+ FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/default.metallib
119
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
120
+ )
121
+ endif()