@@ -323,11 +323,6 @@ macro(add_sourcekit_framework name)
323
323
324
324
325
325
if (SOURCEKIT_DEPLOYMENT_OS MATCHES "^macosx" )
326
- swift_install_in_component (${SOURCEKITFW_INSTALL_IN_COMPONENT}
327
- TARGETS ${name}
328
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
329
- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
330
- RUNTIME DESTINATION bin )
331
326
set_output_directory (${name}
332
327
BINARY_DIR ${SOURCEKIT_RUNTIME_OUTPUT_INTDIR}
333
328
LIBRARY_DIR ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR} )
@@ -341,11 +336,13 @@ macro(add_sourcekit_framework name)
341
336
MACOSX_FRAMEWORK_SHORT_VERSION_STRING "1.0"
342
337
MACOSX_FRAMEWORK_BUNDLE_VERSION "${SOURCEKIT_VERSION_STRING} "
343
338
PUBLIC_HEADER "${headers} " )
344
- else ()
345
339
swift_install_in_component (${SOURCEKITFW_INSTALL_IN_COMPONENT}
346
- DIRECTORY ${framework_location}
347
- DESTINATION lib${LLVM_LIBDIR_SUFFIX}
348
- USE_SOURCE_PERMISSIONS )
340
+ TARGETS ${name}
341
+ FRAMEWORK DESTINATION lib${LLVM_LIBDIR_SUFFIX}
342
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
343
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
344
+ RUNTIME DESTINATION bin )
345
+ else ()
349
346
set_output_directory (${name}
350
347
BINARY_DIR ${framework_location}
351
348
LIBRARY_DIR ${framework_location} )
@@ -355,6 +352,10 @@ macro(add_sourcekit_framework name)
355
352
INSTALL_NAME_DIR "@rpath/${name} .framework"
356
353
PREFIX ""
357
354
SUFFIX "" )
355
+ swift_install_in_component (${SOURCEKITFW_INSTALL_IN_COMPONENT}
356
+ DIRECTORY ${framework_location}
357
+ DESTINATION lib${LLVM_LIBDIR_SUFFIX}
358
+ USE_SOURCE_PERMISSIONS )
358
359
359
360
foreach (hdr ${headers} )
360
361
get_filename_component (hdrname ${hdr} NAME )
0 commit comments