Skip to content

Add header search path for c modules during xcodeproj gen #226

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

Merged
merged 1 commit into from
Apr 1, 2016

Conversation

aciidgh
Copy link
Contributor

@aciidgh aciidgh commented Mar 29, 2016

for header in headerPaths {
headerPathValue += "\"\(header)\","
}
headerPathValue += ")"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest just always writing as a list. This can be reduced to:

headerPathValue = "( " + headerPaths.map({ "\"\($0)\"" }).joined(separator: ", ") + " )"

Also, we really need utilities or other infrastructure for writing out structured values with appropriate quoting, etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that def looks better, updated

@@ -163,6 +183,7 @@ extension SwiftModule {
buildSettings["PRODUCT_MODULE_NAME"] = c99name
buildSettings["OTHER_SWIFT_FLAGS"] = "-DXcode"
buildSettings["MACOSX_DEPLOYMENT_TARGET"] = "'10.10'"
buildSettings["LIBRARY_SEARCH_PATHS"] = "/usr/local/lib"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Justification for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought system modules will probably be present there on darwin, this would be handled better after the "SwiftPM System Module Search Paths" is accepted/implemented. Should I remove this for now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

K, understood. Yes please remove it, I worry we would forget about this sort of buried setting and then people will come to depend on it and then we can never remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@mxcl
Copy link
Contributor

mxcl commented Mar 31, 2016

@swift-ci Please test

@mxcl
Copy link
Contributor

mxcl commented Mar 31, 2016

If it passes, let’s squash the history and merge.

@aciidgh
Copy link
Contributor Author

aciidgh commented Apr 1, 2016

CI Passed, squashing and merging

@aciidgh aciidgh force-pushed the header_search_path_xcodeproj branch from 94b97d4 to 1f5f48a Compare April 1, 2016 02:28
@aciidgh aciidgh merged commit 7661b27 into swiftlang:master Apr 1, 2016
@aciidgh aciidgh deleted the header_search_path_xcodeproj branch April 1, 2016 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants