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

Update Advanced Docking System #423

Merged
merged 4 commits into from
Dec 7, 2023
Merged

Update Advanced Docking System #423

merged 4 commits into from
Dec 7, 2023

Conversation

alxvth
Copy link
Contributor

@alxvth alxvth commented Dec 7, 2023

  • Update ADS to 4.2.1 from 4.0.1 (mainly some memory fixes and Linux and Mac adjustments, see their release notes
  • The library is not suffixed with a "d" in Debug mode (qt6advanceddockingd.dll) like quazip and zlib, which might make cmake packaging easier
  • Set version to 0.9 from 1.0
  • Print out versions of dependencies (qt, ads, quazip and zlib (on linux)) in cmake, see CI:
-- Using Qt version 6.3.2
-- Using Qt Advanced Docking System version 4.2.1
-- Using zlib version 1.2.8
-- Using QuaZip version 1.4

@alxvth alxvth requested a review from ThomasKroes December 7, 2023 10:22
Copy link
Contributor

@ThomasKroes ThomasKroes left a comment

Choose a reason for hiding this comment

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

Looks great! I notice that the version changes in the CMake of this PR, might I suggest that we also change the application version here? Might be nice to already update this so we don't forget :)

@alxvth
Copy link
Contributor Author

alxvth commented Dec 7, 2023

Now there is one central location for setting the version in the cmake:

set(MV_VERSION_MAJOR 0)
set(MV_VERSION_MINOR 9)
set(MV_VERSION_PATCH 0)

Source code can use these version numbers with

#include "ManiVaultVersion.h" // is created by cmake and defines the version numbers as ints

std::cout << "Major " << MV_VERSION_MAJOR << "Minor" << MV_VERSION_MINOR<< "Patch" << MV_VERSION_PATCH << std::endl;

@alxvth alxvth merged commit 2e4a978 into master Dec 7, 2023
0 of 6 checks passed
@alxvth alxvth deleted the feature/updateADS421 branch December 7, 2023 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants