Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix cmake install subdir #634

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

fix cmake install subdir #634

wants to merge 18 commits into from

Commits on Dec 12, 2016

  1. Merge pull request #1 from torch/master 

    merge with torch
    @elikosan
    elikosan authored Dec 12, 2016
    Configuration menu
    Copy the full SHA
    ffc32fa View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2016

  1. remove -j option (does not work on Windows)

    @elikosan
    elikosan authored Dec 13, 2016
    Configuration menu
    Copy the full SHA
    672f228 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. fix wrong export directive for THCCachingHostAllocator

    @elikosan
    elikosan authored Dec 14, 2016
    Configuration menu
    Copy the full SHA
    7331cc3 View commit details
    Browse the repository at this point in the history

  2. restore -j option

    @elikosan
    elikosan authored Dec 14, 2016
    Configuration menu
    Copy the full SHA
    79bff93 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. fix missing cmake definitions 

    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)
    @elikosan
    elikosan authored Dec 15, 2016
    Configuration menu
    Copy the full SHA
    c859c92 View commit details
    Browse the repository at this point in the history

  2. fix install directory logic 

    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.
    @elikosan
    elikosan authored Dec 15, 2016
    Configuration menu
    Copy the full SHA
    0c3dd0c View commit details
    Browse the repository at this point in the history

  3. Update CMakeLists.txt

    @elikosan
    elikosan authored Dec 15, 2016
    Configuration menu
    Copy the full SHA
    d3f4783 View commit details
    Browse the repository at this point in the history

  4. Update CMakeLists.txt

    @elikosan
    elikosan authored Dec 15, 2016
    Configuration menu
    Copy the full SHA
    bf1655a View commit details
    Browse the repository at this point in the history

  5. Update CMakeLists.txt

    @elikosan
    elikosan authored Dec 15, 2016
    Configuration menu
    Copy the full SHA
    3878a22 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from torch/master 

    merge
    @elikosan
    elikosan authored Dec 15, 2016
    Configuration menu
    Copy the full SHA
    e2b794b View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2016

  1. Add THC_EXPORTS flag to windows build to export THC symbols

    @elikosan
    elikosan authored Dec 22, 2016
    Configuration menu
    Copy the full SHA
    48ca4cf View commit details
    Browse the repository at this point in the history

  2. Update CMakeLists.txt

    @elikosan
    elikosan authored Dec 22, 2016
    Configuration menu
    Copy the full SHA
    ff00c04 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. Merge remote-tracking branch 'refs/remotes/torch/master' 

    # Conflicts:
#	lib/THC/CMakeLists.txt
    @elikosan
    elikosan committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    025333a View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Merge remote-tracking branch 'refs/remotes/torch/master'

    @elikosan
    elikosan committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    3f95c33 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. Merge pull request #4 from torch/master 

    merge from master
    @elikosan
    elikosan authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    b7bd5f0 View commit details
    Browse the repository at this point in the history

  2. fix rockspec

    @elikosan
    elikosan committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    63c9198 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2017

  1. cutorch cmake needs lua_libdir

    @elikosan
    elikosan committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    33935a1 View commit details
    Browse the repository at this point in the history

  2. cutorch cmake

    @elikosan
    elikosan committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    b14e265 View commit details
    Browse the repository at this point in the history