Skip to content

Commit 4a9229f

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 4a9229f

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

CMakeLists.txt

Lines changed: 14 additions & 8 deletions
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,8 +608,20 @@ 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
@@ -630,6 +635,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows AND BUILD_SHARED_LIBS)
630635
else()
631636
install(FILES
632637
${Foundation_OUTPUT_FILE}
638+
${FoundationNetworking_OUTPUT_FILE}
633639
DESTINATION
634640
lib/${swift_dir}/${swift_os})
635641
endif()

0 commit comments

Comments
 (0)