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

cmake - no Qt: do not copy GUI folders in Class library #3456

Merged
merged 2 commits into from Jan 23, 2018

Conversation

Projects
None yet
5 participants
@gusano
Copy link
Member

gusano commented Jan 21, 2018

Fix #3420

This avoids installing the following two folders when building with -DSC_QT=0:

  • SCClassLibrary/Common/GUI
  • SCClassLibrary/JITLib/GUI

I tested it quickly on my linux machine (no rpi available ATM) by uninstalling other sc versions and building with that change in:

  • those 2 folders are not in my class lib
  • sclang runs fine from cli and server boots and all

@snappizz snappizz added this to the 3.9.1 milestone Jan 21, 2018

@@ -427,7 +427,7 @@ endif()
set(SCCLASSLIB_EXCLUDE_REGEX "IGNOREME")

if(NOT SC_QT)
set(SCCLASSLIB_EXCLUDE_REGEX "${SCCLASSLIB_EXCLUDE_REGEX}|QtCollider")
set(SCCLASSLIB_EXCLUDE_REGEX "${SCCLASSLIB_EXCLUDE_REGEX}|QtCollider|GUI")

This comment has been minimized.

@brianlheim

brianlheim Jan 21, 2018

Member

Thanks so much! IIUC you could remove QtCollider from this regex entirely. There aren't any folders named that in the class lib directory, this might be a remnant from pre-3.7 (https://github.com/supercollider/supercollider/tree/3.6/SCClassLibrary/QtCollider)

@gusano gusano force-pushed the gusano:topic/headless-no-gui branch from b6c859a to 7a6a322 Jan 21, 2018

@gusano

This comment has been minimized.

Copy link
Member Author

gusano commented Jan 21, 2018

@brianlheim ah ok, forced pushed with your requested change.

@brianlheim

This comment has been minimized.

Copy link
Member

brianlheim commented Jan 21, 2018

Thank you! Will give it a look later.

@brianlheim

This comment has been minimized.

Copy link
Member

brianlheim commented Jan 22, 2018

realized i have to test this on Windows. will get to it tomorrow.
IIUC this means we can also remove some lines from the Travis script: https://github.com/supercollider/supercollider/blob/develop/.travis/fix-non-Qt.sh

@brianlheim

This comment has been minimized.

Copy link
Member

brianlheim commented Jan 23, 2018

Thanks for 737d439 @gusano :) doing a smoke-test of this on Windows now.

@brianlheim
Copy link
Member

brianlheim left a comment

Awesome, thank you!

@brianlheim brianlheim merged commit 29feead into supercollider:develop Jan 23, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rukano

This comment has been minimized.

Copy link
Contributor

rukano commented Jan 23, 2018

Thanks @gusano for this. I was manually removing them, but it's of course better automated. This make now my supercollider docker image work flawlessly out of the box now :)

snappizz added a commit that referenced this pull request Jan 23, 2018

Merge pull request #3463 from brianlheim/3456
Cherry-picking #3456 onto 3.9
@patrickdupuis

This comment has been minimized.

Copy link
Contributor

patrickdupuis commented Jan 28, 2018

@redFrik This PR was cherry-picked into 3.9.1 which means you'll have to update the Rpi and BBB build guides on the website accordingly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment