DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Add support for Swift Package Manager #1032

Closed
salling wants to merge 17 commits from swiftpm into main
pull from: swiftpm
merge into: DaddyFrosty:main
Conversation 11 Commits 17 Files Changed 3 +54
3 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ad32aee26b - Show all commits

2
Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
name: "yoga", name: "yoga",
dependencies: [], dependencies: [],
path: "./yoga", path: "./yoga",
publicHeadersPath: "./apple-public", publicHeadersPath: "./swiftpm-support",
cxxSettings: [ cxxSettings: [
.headerSearchPath("../"), .headerSearchPath("../"),
], ],

3
Yoga.podspec
View File

@@ -33,6 +33,7 @@ Pod::Spec.new do |spec|
'-fPIC' '-fPIC'
] ]
spec.source_files = 'yoga/**/*.{c,h,cpp}' spec.source_files = 'yoga/**/*.{c,h,cpp}'
spec.public_header_files = 'yoga/apple-public/umbrella.h' spec.exclude_files = 'yoga/swiftpm-support/*.h'
spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
end end

2
yoga/apple-public/umbrella.h → yoga/swiftpm-support/umbrella.h
View File

@@ -8,6 +8,7 @@
#pragma once #pragma once
#ifdef __OBJC__ #ifdef __OBJC__
clausjoergensen commented 2020-10-09 06:46:12 -07:00 (Migrated from github.com)
Review
Copy Link

Is it possible to use the SWIFT_PACKAGE preprocessor flag here to make it even safer?

Is it possible to use the [SWIFT_PACKAGE](https://github.com/apple/swift-package-manager/blob/main/Documentation/Usage.md#packaging-legacy-code) preprocessor flag here to make it even safer?
salling commented 2020-10-09 13:12:45 -07:00 (Migrated from github.com)
Review
Copy Link

Does not seem to be defined at the time the public header is compiled. Only when the code that's part of the package is built.

Does not seem to be defined at the time the public header is compiled. Only when the code that's part of the package is built.
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "../YGEnums.h" #include "../YGEnums.h"
@@ -16,4 +17,5 @@
#include "../YGStyle.h" #include "../YGStyle.h"
#include "../YGValue.h" #include "../YGValue.h"
#include "../Yoga.h" #include "../Yoga.h"
#endif #endif