Skip to content

Commit 4f1cb46

Browse files
committed
build: Install libFoundationNetworking.so as part of the build
- libFoundationNetworking was not being installed into the final output directory and was missing from the tarfile.
1 parent 34016a9 commit 4f1cb46

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

Diff for: CMakeLists.txt

+16-8
Original file line numberDiff line numberDiff line change
@@ -600,13 +600,6 @@ if(ENABLE_TESTING)
600600
${CMAKE_CURRENT_BINARY_DIR}/TestFoundation/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX})
601601
endif()
602602

603-
# TODO(compnerd) honour lib vs lib64
604-
install(FILES
605-
${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftdoc
606-
${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftmodule
607-
DESTINATION
608-
lib/swift/${swift_os}/${swift_arch})
609-
610603
if(BUILD_SHARED_LIBS)
611604
set(library_kind SHARED)
612605
set(swift_dir swift)
@@ -615,21 +608,36 @@ else()
615608
set(swift_dir swift_static)
616609
endif()
617610

611+
# TODO(compnerd) honour lib vs lib64
612+
install(FILES
613+
${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftdoc
614+
${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftmodule
615+
${CMAKE_CURRENT_BINARY_DIR}/swift/FoundationNetworking.swiftdoc
616+
${CMAKE_CURRENT_BINARY_DIR}/swift/FoundationNetworking.swiftmodule
617+
DESTINATION
618+
lib/${swift_dir}/${swift_os}/${swift_arch})
619+
620+
618621
set(Foundation_OUTPUT_FILE
619-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_${library_kind}_LIBRARY_PREFIX}Foundation${CMAKE_${library_kind}_LIBRARY_SUFFIX})
622+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_${library_kind}_LIBRARY_PREFIX}Foundation${CMAKE_${library_kind}_LIBRARY_SUFFIX})
623+
set(FoundationNetworking_OUTPUT_FILE
624+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_${library_kind}_LIBRARY_PREFIX}FoundationNetworking${CMAKE_${library_kind}_LIBRARY_SUFFIX})
620625

621626
if(CMAKE_SYSTEM_NAME STREQUAL Windows AND BUILD_SHARED_LIBS)
622627
install(FILES
623628
${Foundation_OUTPUT_FILE}
629+
${FoundationNetworking_OUTPUT_FILE}
624630
DESTINATION
625631
bin)
626632
install(FILES
627633
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}Foundation${CMAKE_IMPORT_LIBRARY_SUFFIX}
634+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}FoundationNetworking${CMAKE_IMPORT_LIBRARY_SUFFIX}
628635
DESTINATION
629636
lib/${swift_dir}/${swift_os})
630637
else()
631638
install(FILES
632639
${Foundation_OUTPUT_FILE}
640+
${FoundationNetworking_OUTPUT_FILE}
633641
DESTINATION
634642
lib/${swift_dir}/${swift_os})
635643
endif()

0 commit comments

Comments
 (0)