From 3c6cb8cd56d04392bf9f79a2d5020fc2abf1958d Mon Sep 17 00:00:00 2001 From: Karoy Lorentey Date: Wed, 19 Oct 2022 17:35:13 -0700 Subject: [PATCH] Update CMake configuration --- Sources/BitCollections/CMakeLists.txt | 1 + Sources/OrderedCollections/CMakeLists.txt | 17 +++++++++++------ Sources/_CollectionsUtilities/CMakeLists.txt | 2 ++ ...ollections.swift => _SortedCollection.swift} | 0 4 files changed, 14 insertions(+), 6 deletions(-) rename Sources/_CollectionsUtilities/{_SortedCollections.swift => _SortedCollection.swift} (100%) diff --git a/Sources/BitCollections/CMakeLists.txt b/Sources/BitCollections/CMakeLists.txt index e7f62c45d..2e9c3681d 100644 --- a/Sources/BitCollections/CMakeLists.txt +++ b/Sources/BitCollections/CMakeLists.txt @@ -47,6 +47,7 @@ add_library(BitCollections "BitSet/BitSet+SetAlgebra formUnion.swift" "BitSet/BitSet+SetAlgebra intersection.swift" "BitSet/BitSet+SetAlgebra isDisjoint.swift" + "BitSet/BitSet+SetAlgebra isEqual.swift" "BitSet/BitSet+SetAlgebra isStrictSubset.swift" "BitSet/BitSet+SetAlgebra isStrictSuperset.swift" "BitSet/BitSet+SetAlgebra isSubset.swift" diff --git a/Sources/OrderedCollections/CMakeLists.txt b/Sources/OrderedCollections/CMakeLists.txt index e6408926a..f1cd5271b 100644 --- a/Sources/OrderedCollections/CMakeLists.txt +++ b/Sources/OrderedCollections/CMakeLists.txt @@ -8,14 +8,16 @@ See https://swift.org/LICENSE.txt for license information #]] add_library(OrderedCollections + "HashTable/_HashTable.swift" "HashTable/_HashTable+Bucket.swift" "HashTable/_HashTable+BucketIterator.swift" "HashTable/_HashTable+Constants.swift" "HashTable/_HashTable+CustomStringConvertible.swift" + "HashTable/_Hashtable+Header.swift" "HashTable/_HashTable+Testing.swift" "HashTable/_HashTable+UnsafeHandle.swift" - "HashTable/_HashTable.swift" - "HashTable/_Hashtable+Header.swift" + "OrderedDictionary/OrderedDictionary.Elements.swift" + "OrderedDictionary/OrderedDictionary.swift" "OrderedDictionary/OrderedDictionary+Codable.swift" "OrderedDictionary/OrderedDictionary+CustomReflectable.swift" "OrderedDictionary/OrderedDictionary+Deprecations.swift" @@ -31,8 +33,7 @@ add_library(OrderedCollections "OrderedDictionary/OrderedDictionary+Sendable.swift" "OrderedDictionary/OrderedDictionary+Sequence.swift" "OrderedDictionary/OrderedDictionary+Values.swift" - "OrderedDictionary/OrderedDictionary.Elements.swift" - "OrderedDictionary/OrderedDictionary.swift" + "OrderedSet/OrderedSet.swift" "OrderedSet/OrderedSet+Codable.swift" "OrderedSet/OrderedSet+CustomReflectable.swift" "OrderedSet/OrderedSet+Descriptions.swift" @@ -45,9 +46,14 @@ add_library(OrderedCollections "OrderedSet/OrderedSet+Invariants.swift" "OrderedSet/OrderedSet+Partial MutableCollection.swift" "OrderedSet/OrderedSet+Partial RangeReplaceableCollection.swift" + "OrderedSet/OrderedSet+Partial SetAlgebra isDisjoint.swift" + "OrderedSet/OrderedSet+Partial SetAlgebra isEqual.swift" + "OrderedSet/OrderedSet+Partial SetAlgebra isStrictSubset.swift" + "OrderedSet/OrderedSet+Partial SetAlgebra isStrictSuperset.swift" + "OrderedSet/OrderedSet+Partial SetAlgebra isSubset.swift" + "OrderedSet/OrderedSet+Partial SetAlgebra isSuperset.swift" "OrderedSet/OrderedSet+Partial SetAlgebra+Basics.swift" "OrderedSet/OrderedSet+Partial SetAlgebra+Operations.swift" - "OrderedSet/OrderedSet+Partial SetAlgebra+Predicates.swift" "OrderedSet/OrderedSet+RandomAccessCollection.swift" "OrderedSet/OrderedSet+ReserveCapacity.swift" "OrderedSet/OrderedSet+Sendable.swift" @@ -55,7 +61,6 @@ add_library(OrderedCollections "OrderedSet/OrderedSet+Testing.swift" "OrderedSet/OrderedSet+UnorderedView.swift" "OrderedSet/OrderedSet+UnstableInternals.swift" - "OrderedSet/OrderedSet.swift" "Utilities/_UnsafeBitset.swift" ) target_link_libraries(OrderedCollections PRIVATE diff --git a/Sources/_CollectionsUtilities/CMakeLists.txt b/Sources/_CollectionsUtilities/CMakeLists.txt index fd24b7e42..e3572ef52 100644 --- a/Sources/_CollectionsUtilities/CMakeLists.txt +++ b/Sources/_CollectionsUtilities/CMakeLists.txt @@ -8,6 +8,8 @@ See https://swift.org/LICENSE.txt for license information #]] add_library(_CollectionsUtilities + "_SortedCollection.swift" + "_UniqueCollection.swift" "Array+WithContiguousStorage Compatibility.swift" "Debugging.swift" "Descriptions.swift" diff --git a/Sources/_CollectionsUtilities/_SortedCollections.swift b/Sources/_CollectionsUtilities/_SortedCollection.swift similarity index 100% rename from Sources/_CollectionsUtilities/_SortedCollections.swift rename to Sources/_CollectionsUtilities/_SortedCollection.swift