cmake

Author: tomerd

CMakeLists.txt

@@ -53,7 +53,8 @@ if(FIND_PM_DEPS)
   find_package(ArgumentParser CONFIG REQUIRED)
   find_package(SwiftCrypto CONFIG REQUIRED)
   find_package(SwiftDriver CONFIG REQUIRED)
-  find_package(SwiftCollections CONFIG REQUIRED)
+  # FIXME: need to change in SwiftCollections (swift-collections -> SwiftCollections)
+  find_package(swift-collections CONFIG REQUIRED)
 endif()
 
 find_package(dispatch QUIET)

Sources/Basics/CMakeLists.txt

@@ -22,7 +22,7 @@ add_library(Basics
   SQLiteBackedCache.swift
   Version+Extensions.swift)
 target_link_libraries(Basics PUBLIC
-  OrderedCollections
+  SwiftCollections::OrderedCollections
   TSCBasic
   TSCUtility)
 target_link_libraries(Basics PRIVATE

Utilities/bootstrap

@@ -604,7 +604,9 @@ def build_swiftpm_with_cmake(args):
         "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),
         "-DSwiftDriver_DIR=" + os.path.join(args.swift_driver_build_dir, "cmake/modules"),
         "-DSwiftCrypto_DIR=" + os.path.join(args.swift_crypto_build_dir, "cmake/modules"),
-        "-DSwiftCollections_DIR=" + os.path.join(args.swift_collections_build_dir, "cmake/modules"),
+        # FIXME: need to change in SwiftCollections (swift-collections -> SwiftCollections)
+        #"-DSwiftCollections_DIR=" + os.path.join(args.swift_collections_build_dir, "cmake/modules"),        
+        "-Dswift-collections_DIR=" + os.path.join(args.swift_collections_build_dir),
     ]
 
     if platform.system() == 'Darwin':