New helper macro + fixes for old gcc #948
Merged
Conversation
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
soumith
reviewed
Mar 1, 2017
cmake/TorchPackage.cmake
Outdated
| endif() | ||
| ELSE() | ||
| IF (BUILD_STATIC OR "$ENV{TH_ONLY_STATIC}" STREQUAL "YES") | ||
| ADD_LIBRARY(${package} ${type} "") |
There was a problem hiding this comment.
Hmm it looks like I messed something up during rebasing. Let me double check this.
There was a problem hiding this comment.
Ok, it isn't missing STATIC, it is missing source files. It was a hacky way to "disable" dynamic builds, when only static versions were required, by creating a dummy .so file.
I am going to remove this logic and update the PR.
|
@soumith Removed that code segment. The current behavior is similar to the current version in master where both static and dynamic libs are built when static builds are requested. If not only dynamic libs are built. |
|
if you rebase, i'll merge this. |
|
@soumith sorry about not getting back to this, I'll clean this up tomorrow. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ADD_TORCH_LIBRARYmakes it easier to linklibTHfrom various other packages.