fix cmake install subdir #634
Open
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
merge with torch
Torch installation directories need to be propagated otherwise cutorch installs in the wrong directories (they default to lib, include,bin,etc and thus works on default installs)
now that install dirs are set properly in upstream CMakefile, they don't need to be reset here, plus the INCLUDE_DIRECTORIES and LINK_DIRECTORIES (lines 111,112) statement should be executed.
# Conflicts: # lib/THC/CMakeLists.txt
merge from master
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.
cutorch installs .lib, .dll and includes always in lib/, bin/, include/, no matter what is specified by the Torch_INSTALL_*_SUBDIR cmake variable.