@@ -600,13 +600,6 @@ if(ENABLE_TESTING)
600
600
${CMAKE_CURRENT_BINARY_DIR} /TestFoundation/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX} )
601
601
endif ()
602
602
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
-
610
603
if (BUILD_SHARED_LIBS )
611
604
set (library_kind SHARED)
612
605
set (swift_dir swift)
@@ -615,21 +608,36 @@ else()
615
608
set (swift_dir swift_static)
616
609
endif ()
617
610
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
+
618
621
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})
620
625
621
626
if (CMAKE_SYSTEM_NAME STREQUAL Windows AND BUILD_SHARED_LIBS )
622
627
install (FILES
623
628
${Foundation_OUTPUT_FILE}
629
+ ${FoundationNetworking_OUTPUT_FILE}
624
630
DESTINATION
625
631
bin)
626
632
install (FILES
627
633
${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}
628
635
DESTINATION
629
636
lib/${swift_dir} /${swift_os} )
630
637
else ()
631
638
install (FILES
632
639
${Foundation_OUTPUT_FILE}
640
+ ${FoundationNetworking_OUTPUT_FILE}
633
641
DESTINATION
634
642
lib/${swift_dir} /${swift_os} )
635
643
endif ()
0 commit comments