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

Deactivate Modeler by default, since it is deprecated #972

Merged
merged 3 commits into from
Apr 4, 2019
Merged

Deactivate Modeler by default, since it is deprecated #972

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5467ac
Deactivate Modeler by default, since it is deprecated
tgaugry Mar 27, 2019
e99b10d
Remove condition on modeler, as it deactivate it anyway
tgaugry Mar 27, 2019
6751486
Set Modeler find_package for qt to required
tgaugry Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions applications/projects/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ if(NOT Qt5Core_FOUND)
set(SOFA_HAVE_QT_LIBRARIES 0)
endif()

if(SOFA_HAVE_QT_LIBRARIES)
sofa_add_application(Modeler Modeler ON)
endif()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? I would have kept the condition.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did too at first, but it's a bit weird to do a check required for activation to then deactivate the thing. If the modeler require qt, then it should check for qt itself.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the modeler require qt, then it should check for qt itself.

I agree with that but you can't just remove the condition then, you should move it to Modeler's CMakeLists (and fail or warn+return if false).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modeler does find_package(Qt5 COMPONENTS Core QUIET)
Maybe just change that to REQUIRED ?

Copy link
Contributor

@guparan guparan Mar 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm good with that 👍

sofa_add_application(Modeler Modeler OFF)

sofa_add_application(getDeprecatedComponents getDeprecatedComponents OFF)

Expand Down