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

switch to using c++ compiler instead of g++ to fix cpp-demos on mac os x #1865

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

switch to using c++ compiler instead of g++ to fix cpp-demos on mac os x #1865

wants to merge 44 commits into from

Commits on May 2, 2018

  1. CQF is replaced by MQF

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    2d3f56d View commit details
    Browse the repository at this point in the history

  2. see if this the problem

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    02ff941 View commit details
    Browse the repository at this point in the history

  3. check again

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    cfa0708 View commit details
    Browse the repository at this point in the history

  4. remove exceptions

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    7f9cec3 View commit details
    Browse the repository at this point in the history

  5. remove exceptions to be continued

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    8b2ecf4 View commit details
    Browse the repository at this point in the history

  6. test flag

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    0f40129 View commit details
    Browse the repository at this point in the history

  7. test

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    e8e8316 View commit details
    Browse the repository at this point in the history

  8. testagain

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    7c19647 View commit details
    Browse the repository at this point in the history

  9. ttt

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    837dc64 View commit details
    Browse the repository at this point in the history

  10. reset

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    c6f1a70 View commit details
    Browse the repository at this point in the history

  11. test again

    @shokrof
    shokrof committed May 2, 2018
    Configuration menu
    Copy the full SHA
    9a3fd68 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. Merge branch 'master' into MQFIntegration

    @ctb
    ctb authored May 7, 2018
    Configuration menu
    Copy the full SHA
    88f1276 View commit details
    Browse the repository at this point in the history

  2. possible fix for OSx bug

    @shokrof
    shokrof committed May 7, 2018
    Configuration menu
    Copy the full SHA
    068f6d4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'MQFIntegration' of https://github.com/dib-lab/khmer int… 

    …o MQFIntegration
    @shokrof
    shokrof committed May 7, 2018
    Configuration menu
    Copy the full SHA
    c3c822a View commit details
    Browse the repository at this point in the history

  4. fix for OSX

    @shokrof
    shokrof committed May 7, 2018
    Configuration menu
    Copy the full SHA
    797d6a3 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2018

  1. test change

    @shokrof
    shokrof committed May 18, 2018
    Configuration menu
    Copy the full SHA
    c7c62d6 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2018

  1. switch to using c++ compiler instead of g++ to fix cpp-demos on mac os x

    @ctb
    ctb committed May 19, 2018
    Configuration menu
    Copy the full SHA
    69bd37c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:dib-lab/khmer into mqf/ctbfix

    @ctb
    ctb committed May 19, 2018
    Configuration menu
    Copy the full SHA
    43f3741 View commit details
    Browse the repository at this point in the history

  3. update c++-example makefile to use c++ instead of g++

    @ctb
    ctb committed May 19, 2018
    Configuration menu
    Copy the full SHA
    6d038ac View commit details
    Browse the repository at this point in the history

  4. try disabling g++ more globally

    @ctb
    ctb committed May 19, 2018
    Configuration menu
    Copy the full SHA
    207888b View commit details
    Browse the repository at this point in the history

  5. ok try forcing the issue of using cc/c++

    @ctb
    ctb committed May 19, 2018
    Configuration menu
    Copy the full SHA
    e4a9b6d View commit details
    Browse the repository at this point in the history

Commits on May 20, 2018

  1. add -v flag for debugging output

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    c5147f9 View commit details
    Browse the repository at this point in the history

  2. allow shared library linking

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    2bf68f1 View commit details
    Browse the repository at this point in the history

  3. include -lstdc++ at very end

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    2fcd67b View commit details
    Browse the repository at this point in the history

  4. reorder arguments to work on my laptop :)

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    3d5be36 View commit details
    Browse the repository at this point in the history

  5. revert cpp-demos makefile to something that mostly worked; try forcin… 

    …g setup.py to use -lstdc++ on darwin
    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    af5f92a View commit details
    Browse the repository at this point in the history

  6. argh fix append to extend

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    ae0d09b View commit details
    Browse the repository at this point in the history

  7. specify arch specifically

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    3df15f5 View commit details
    Browse the repository at this point in the history

  8. bump xcode version

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    7b3252d View commit details
    Browse the repository at this point in the history

  9. bump xcode version again

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    d31922c View commit details
    Browse the repository at this point in the history

  10. ok, try swizzling around extern for cplusplus

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    125aad1 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into MQFIntegration

    @ctb
    ctb authored May 20, 2018
    Configuration menu
    Copy the full SHA
    739d887 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'MQFIntegration' of github.com:dib-lab/khmer into mqf/ct… 

    …bfix
    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    6d426e4 View commit details
    Browse the repository at this point in the history

  13. ok, disable extern C stuff

    @ctb
    ctb committed May 20, 2018
    Configuration menu
    Copy the full SHA
    03bf2ef View commit details
    Browse the repository at this point in the history

  14. add -lstdc++ to the compilation command of mqf

    @shokrof
    shokrof committed May 20, 2018
    Configuration menu
    Copy the full SHA
    c221d92 View commit details
    Browse the repository at this point in the history

  15. print os name

    @shokrof
    shokrof committed May 20, 2018
    Configuration menu
    Copy the full SHA
    70d8abb View commit details
    Browse the repository at this point in the history

  16. No need to specail condition.

    @shokrof
    shokrof committed May 20, 2018
    Configuration menu
    Copy the full SHA
    71690f4 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2018

  1. add linking flags

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    f405fef View commit details
    Browse the repository at this point in the history

  2. remove bundle

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    be181c3 View commit details
    Browse the repository at this point in the history

  3. add linking flags to cpp examples

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    d00757a View commit details
    Browse the repository at this point in the history

  4. add -lstdcc

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    1621b1c View commit details
    Browse the repository at this point in the history

  5. t

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    a4bc9c6 View commit details
    Browse the repository at this point in the history

  6. test

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    bdb59a8 View commit details
    Browse the repository at this point in the history

  7. add -stdlib=libstdc++ to compiling and linking

    @shokrof
    shokrof committed May 21, 2018
    Configuration menu
    Copy the full SHA
    453fefb View commit details
    Browse the repository at this point in the history