Skip to content

Fix ODR violations when using CMake unity builds. #609

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
Merged
githubuser0xFFFF merged 1 commit into from
Feb 28, 2024
Merged

Fix ODR violations when using CMake unity builds. #609

githubuser0xFFFF merged 1 commit into from
Feb 28, 2024

Conversation

@tnixeu
Copy link

@tnixeu tnixeu commented Feb 28, 2024

I like to build my projects with CMAKE_UNITY_BUILD enabled. However, a few ODR vialations prevent a unity build.

I changed the following things:

  • move the LocationProperty to the ads_globals.h header
  • use the LocationProperty for all "Location" strings
  • rename zOrderCounter in FloatingDockContainer.cpp to zOrderCounterFloating

@githubuser0xFFFF
Copy link
Owner

githubuser0xFFFF commented Feb 28, 2024

Thank you.

@githubuser0xFFFF githubuser0xFFFF merged commit fb58c43 into githubuser0xFFFF:master Feb 28, 2024
@tnixeu tnixeu deleted the fix_unity_build branch February 28, 2024 13:55
mike-malburg pushed a commit to TechSmith/Qt-Advanced-Docking-System that referenced this pull request Nov 6, 2025
@tnixeu @mike-malburg
Fix ODR violations when using CMake unity builds. (githubuser0xFFFF#609)
f73c690
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@tnixeu @githubuser0xFFFF