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.

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

Fix cmake not building correctly when WITH_CJSON=OFF #2027

Merged
merged 1 commit into from Jan 19, 2021

Conversation

madhat1
Copy link
Contributor

@madhat1 madhat1 commented Jan 17, 2021

Thank you for contributing your time to the Mosquitto project!

Before you go any further, please note that we cannot accept contributions if
you haven't signed the Eclipse Contributor Agreement.
If you aren't able to do that, or just don't want to, please describe your bug
fix/feature change in an issue. For simple bug fixes it is can be just as easy
for us to be told about the problem and then go fix it directly.

Then please check the following list of things we ask for in your pull request:

  • Have you signed the Eclipse Contributor Agreement, using the same email address as you used in your commits?
  • Do each of your commits have a "Signed-off-by" line, with the correct email address? Use "git commit -s" to generate this line for you.
  • If you are contributing a new feature, is your work based off the develop branch?
  • If you are contributing a bugfix, is your work based off the fixes branch?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you successfully run make test with your changes locally?
    It fails before and after my fix, I don't have cJson installed.

Fix cmake not building correctly when WITH_CJSON=OFF.
In the main CMakeLists.txt, the cJson discovery process is executed regardless if WITH_CJSON is ON or OFF, this MR fixes that.

This fixes #2026

When using cmake to build the project, cJson discovery
should only be performed if WITH_CJSON=ON.

Closes eclipse#2026.

Signed-off-by: Boris Feinstein <[email protected]>
@ralight ralight added this to the 2.0.6 milestone Jan 19, 2021
@ralight ralight merged commit e6aa1e8 into eclipse:fixes Jan 19, 2021
@ralight
Copy link
Contributor

ralight commented Jan 19, 2021

Thanks very much!

@madhat1
Copy link
Contributor Author

madhat1 commented Jan 19, 2021

No prob, my pleasure 😀. Is this fix expected to be included in v2.0.6?

@ralight
Copy link
Contributor

ralight commented Jan 19, 2021

Yes, it's in fixes now which will become 2.0.6 in about a week.

@madhat1
Copy link
Contributor Author

madhat1 commented Jan 19, 2021

Awesome, keep up the good work mate!
BTW, the latest support for UDS in lib and broker is a big improvement, kudos for that!

@madhat1 madhat1 deleted the bugfix/fix_cjson_cmake branch January 19, 2021 10:00
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants