New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update CMake configuration in preparation for 1.1 #200
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| #[[ | ||
| This source file is part of the Swift Collections Open Source Project | ||
|
|
||
| Copyright (c) 2022 Apple Inc. and the Swift project authors | ||
| Licensed under Apache License v2.0 with Runtime Library Exception | ||
|
|
||
| See https://swift.org/LICENSE.txt for license information | ||
| #]] | ||
|
|
||
| add_library(BitCollections | ||
| "BitArray/BitArray+BitwiseOperations.swift" | ||
| "BitArray/BitArray+ChunkedBitsIterators.swift" | ||
| "BitArray/BitArray+Codable.swift" | ||
| "BitArray/BitArray+Collection.swift" | ||
| "BitArray/BitArray+Copy.swift" | ||
| "BitArray/BitArray+CustomDebugStringConvertible.swift" | ||
| "BitArray/BitArray+CustomReflectable.swift" | ||
| "BitArray/BitArray+CustomStringConvertible.swift" | ||
| "BitArray/BitArray+Equatable.swift" | ||
| "BitArray/BitArray+ExpressibleByArrayLiteral.swift" | ||
| "BitArray/BitArray+Extras.swift" | ||
| "BitArray/BitArray+Fill.swift" | ||
| "BitArray/BitArray+Hashable.swift" | ||
| "BitArray/BitArray+Initializers.swift" | ||
| "BitArray/BitArray+Invariants.swift" | ||
| "BitArray/BitArray+Random.swift" | ||
| "BitArray/BitArray+RangeReplaceableCollection.swift" | ||
| "BitArray/BitArray+Testing.swift" | ||
| "BitArray/BitArray._UnsafeHandle.swift" | ||
| "BitArray/BitArray.swift" | ||
| "BitSet/BitSet+BidirectionalCollection.swift" | ||
| "BitSet/BitSet+Codable.swift" | ||
| "BitSet/BitSet+CustomDebugStringConvertible.swift" | ||
| "BitSet/BitSet+CustomReflectable.swift" | ||
| "BitSet/BitSet+CustomStringConvertible.swift" | ||
| "BitSet/BitSet+Equatable.swift" | ||
| "BitSet/BitSet+ExpressibleByArrayLiteral.swift" | ||
| "BitSet/BitSet+Extras.swift" | ||
| "BitSet/BitSet+Hashable.swift" | ||
| "BitSet/BitSet+Initializers.swift" | ||
| "BitSet/BitSet+Invariants.swift" | ||
| "BitSet/BitSet+Random.swift" | ||
| "BitSet/BitSet+SetAlgebra basics.swift" | ||
| "BitSet/BitSet+SetAlgebra conformance.swift" | ||
| "BitSet/BitSet+SetAlgebra formIntersection.swift" | ||
| "BitSet/BitSet+SetAlgebra formSymmetricDifference.swift" | ||
| "BitSet/BitSet+SetAlgebra formUnion.swift" | ||
| "BitSet/BitSet+SetAlgebra intersection.swift" | ||
| "BitSet/BitSet+SetAlgebra isDisjoint.swift" | ||
| "BitSet/BitSet+SetAlgebra isStrictSubset.swift" | ||
| "BitSet/BitSet+SetAlgebra isStrictSuperset.swift" | ||
| "BitSet/BitSet+SetAlgebra isSubset.swift" | ||
| "BitSet/BitSet+SetAlgebra isSuperset.swift" | ||
| "BitSet/BitSet+SetAlgebra subtract.swift" | ||
| "BitSet/BitSet+SetAlgebra subtracting.swift" | ||
| "BitSet/BitSet+SetAlgebra symmetricDifference.swift" | ||
| "BitSet/BitSet+SetAlgebra union.swift" | ||
| "BitSet/BitSet.Counted.swift" | ||
| "BitSet/BitSet.Index.swift" | ||
| "BitSet/BitSet._UnsafeHandle.swift" | ||
| "BitSet/BitSet.swift" | ||
| "Shared/Range+Utilities.swift" | ||
| "Shared/Slice+Utilities.swift" | ||
| "Shared/UInt+Tricks.swift" | ||
| "Shared/_BitPosition.swift" | ||
| "Shared/_Word.swift" | ||
| ) | ||
| target_link_libraries(BitCollections PRIVATE | ||
| _CollectionsUtilities) | ||
| set_target_properties(BitCollections PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) | ||
|
|
||
| _install_target(BitCollections) | ||
| set_property(GLOBAL APPEND PROPERTY SWIFT_COLLECTIONS_EXPORTS BitCollections) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| #[[ | ||
| This source file is part of the Swift Collections Open Source Project | ||
|
|
||
| Copyright (c) 2022 Apple Inc. and the Swift project authors | ||
| Licensed under Apache License v2.0 with Runtime Library Exception | ||
|
|
||
| See https://swift.org/LICENSE.txt for license information | ||
| #]] | ||
|
|
||
| add_library(PersistentCollections | ||
| "Node/_AncestorSlots.swift" | ||
| "Node/_Bitmap.swift" | ||
| "Node/_Bucket.swift" | ||
| "Node/_Hash.swift" | ||
| "Node/_HashTreeIterator.swift" | ||
| "Node/_HashTreeStatistics.swift" | ||
| "Node/_Level.swift" | ||
| "Node/_Node+Builder.swift" | ||
| "Node/_Node+CustomStringConvertible.swift" | ||
| "Node/_Node+Debugging.swift" | ||
| "Node/_Node+Initializers.swift" | ||
| "Node/_Node+Invariants.swift" | ||
| "Node/_Node+Lookups.swift" | ||
| "Node/_Node+Primitive Insertions.swift" | ||
| "Node/_Node+Primitive Removals.swift" | ||
| "Node/_Node+Primitive Replacement.swift" | ||
| "Node/_Node+Storage.swift" | ||
| "Node/_Node+Structural compactMapValues.swift" | ||
| "Node/_Node+Structural filter.swift" | ||
| "Node/_Node+Structural intersection.swift" | ||
| "Node/_Node+Structural isDisjoint.swift" | ||
| "Node/_Node+Structural isEqual.swift" | ||
| "Node/_Node+Structural isSubset.swift" | ||
| "Node/_Node+Structural mapValues.swift" | ||
| "Node/_Node+Structural merge.swift" | ||
| "Node/_Node+Structural subtracting.swift" | ||
| "Node/_Node+Structural symmetricDifference.swift" | ||
| "Node/_Node+Structural union.swift" | ||
| "Node/_Node+Subtree Insertions.swift" | ||
| "Node/_Node+Subtree Modify.swift" | ||
| "Node/_Node+Subtree Removals.swift" | ||
| "Node/_Node+UnsafeHandle.swift" | ||
| "Node/_Node.swift" | ||
| "Node/_RawNode+UnsafeHandle.swift" | ||
| "Node/_RawNode.swift" | ||
| "Node/_Slot.swift" | ||
| "Node/_Stack.swift" | ||
| "Node/_StorageHeader.swift" | ||
| "Node/_UnmanagedNode.swift" | ||
| "Node/_UnsafePath.swift" | ||
| "PersistentDictionary/PersistentDictionary+Codable.swift" | ||
| "PersistentDictionary/PersistentDictionary+Collection.swift" | ||
| "PersistentDictionary/PersistentDictionary+CustomReflectable.swift" | ||
| "PersistentDictionary/PersistentDictionary+Debugging.swift" | ||
| "PersistentDictionary/PersistentDictionary+Descriptions.swift" | ||
| "PersistentDictionary/PersistentDictionary+Equatable.swift" | ||
| "PersistentDictionary/PersistentDictionary+ExpressibleByDictionaryLiteral.swift" | ||
| "PersistentDictionary/PersistentDictionary+Filter.swift" | ||
| "PersistentDictionary/PersistentDictionary+Hashable.swift" | ||
| "PersistentDictionary/PersistentDictionary+Initializers.swift" | ||
| "PersistentDictionary/PersistentDictionary+Keys.swift" | ||
| "PersistentDictionary/PersistentDictionary+MapValues.swift" | ||
| "PersistentDictionary/PersistentDictionary+Merge.swift" | ||
| "PersistentDictionary/PersistentDictionary+Sendable.swift" | ||
| "PersistentDictionary/PersistentDictionary+Sequence.swift" | ||
| "PersistentDictionary/PersistentDictionary+Values.swift" | ||
| "PersistentDictionary/PersistentDictionary.swift" | ||
| "PersistentSet/PersistentSet+Codable.swift" | ||
| "PersistentSet/PersistentSet+Collection.swift" | ||
| "PersistentSet/PersistentSet+CustomReflectable.swift" | ||
| "PersistentSet/PersistentSet+Debugging.swift" | ||
| "PersistentSet/PersistentSet+Descriptions.swift" | ||
| "PersistentSet/PersistentSet+Equatable.swift" | ||
| "PersistentSet/PersistentSet+ExpressibleByArrayLiteral.swift" | ||
| "PersistentSet/PersistentSet+Extras.swift" | ||
| "PersistentSet/PersistentSet+Filter.swift" | ||
| "PersistentSet/PersistentSet+Hashable.swift" | ||
| "PersistentSet/PersistentSet+Sendable.swift" | ||
| "PersistentSet/PersistentSet+Sequence.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra Initializers.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra basics.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra fluent basics.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra formIntersection.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra formSymmetricDifference.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra formUnion.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra intersection.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra isDisjoint.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra isEqual.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra isStrictSubset.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra isStrictSuperset.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra isSubset.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra isSuperset.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra subtract.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra subtracting.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra symmetricDifference.swift" | ||
| "PersistentSet/PersistentSet+SetAlgebra union.swift" | ||
| "PersistentSet/PersistentSet.swift" | ||
| ) | ||
| target_link_libraries(PersistentCollections PRIVATE | ||
| _CollectionsUtilities) | ||
| set_target_properties(PersistentCollections PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) | ||
|
|
||
| _install_target(PersistentCollections) | ||
| set_property(GLOBAL APPEND PROPERTY SWIFT_COLLECTIONS_EXPORTS PersistentCollections) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #[[ | ||
| This source file is part of the Swift Collections Open Source Project | ||
|
|
||
| Copyright (c) 2022 Apple Inc. and the Swift project authors | ||
| Licensed under Apache License v2.0 with Runtime Library Exception | ||
|
|
||
| See https://swift.org/LICENSE.txt for license information | ||
| #]] | ||
|
|
||
| add_library(_CollectionsUtilities | ||
| "Array+WithContiguousStorage Compatibility.swift" | ||
| "CMakeLists.txt" | ||
| "Debugging.swift" | ||
| "Descriptions.swift" | ||
| "IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift" | ||
| "IntegerTricks/Integer rank.swift" | ||
| "IntegerTricks/UInt+first and last set bit.swift" | ||
| "IntegerTricks/UInt+reversed.swift" | ||
| "RandomAccessCollection+Offsets.swift" | ||
| "UnsafeBufferPointer+Extras.swift" | ||
| "UnsafeMutableBufferPointer+Extras.swift" | ||
| "UnsafeMutableBufferPointer+SE-0370.swift" | ||
| "UnsafeMutablePointer+SE-0370.swift" | ||
| "UnsafeRawPointer extensions.swift" | ||
| ) | ||
| set_target_properties(_CollectionsUtilities PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) | ||
|
|
||
| _install_target(_CollectionsUtilities) | ||
| set_property(GLOBAL APPEND PROPERTY SWIFT_COLLECTIONS_EXPORTS _CollectionsUtilities) | ||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be removed, this is going to cause a build failure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh good eye -- I wonder how my Ninja test run didn't complain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question - not sure about that. There must've been something which prevented that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in #203. (Btw, apologies for merging this too soon -- I was trigger happy to get an upcoming merge to
maingo quickly.)