-
Notifications
You must be signed in to change notification settings - Fork 125
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
Cherry-pick PRs and release notes for v3.0.2 #143
Merged
cary-ilm
merged 11 commits into
AcademySoftwareFoundation:RB-3.0
from
cary-ilm:patches-3.0.2
May 16, 2021
Merged
Cherry-pick PRs and release notes for v3.0.2 #143
cary-ilm
merged 11 commits into
AcademySoftwareFoundation:RB-3.0
from
cary-ilm:patches-3.0.2
May 16, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Expose IMATH_LIB_VERSION_STRING, for easier diagnostics Expose the IMATH_LIB_VERSION as a cpp define, along with IMATH_VERSION, to aid in confirming what SOCURRENT.SOAGE.SOVERSION the library is built with. Signed-off-by: Cary Phillips <[email protected]> * Add comment explaining IMATH_LIB_VERSION Signed-off-by: Cary Phillips <[email protected]>
Signed-off-by: Cary Phillips <[email protected]>
) We were setting target_compile_features(${objlib} PUBLIC cxx_std_${IMATH_CXX_STANDARD}) The PUBLIC forced downstream projects that consume the ImathConfig*.cmake exports to use C++ standard at least as recent as what Imath used to build (which defaults to 14). But this is unnecessary. There's nothing in Imath's headers that requires anything beyond C++11. So this patch uses a more fine-grained setting of target properties to express this more correctly. Now it will be fine for a C++11 project to consume Imath (via its exported configs) even if that Imath happened to be built with C++14. This change is exactly the same as AcademySoftwareFoundation/openexr#995 Signed-off-by: Larry Gritz <[email protected]>
And add more thorough test. Signed-off-by: Cary Phillips <[email protected]>
* Clean up setting of Imath version * Set the version via the project() statement in top-level CMakeLists.txt, so all version-related settings are close together in an obvious place. Deprecate config/version.cmake and move logic to top level * New option IMATH_VERSION_EXTRA to hold "dev" for the master branch * Simplfy logic for SOVERSION.SOAGE.SOREVISION (no more SOCURRENT) Signed-off-by: Cary Phillips <[email protected]> * find_package uses CMAKE_PROJECT_VERSION instead of IMATH_VERSION And removed EXACT since IMATH_VERSION includes IMATH_VERISON_EXTRA. Signed-off-by: Cary Phillips <[email protected]> * Bump SOVERSION to 28 Signed-off-by: Cary Phillips <[email protected]>
Signed-off-by: Cary Phillips <[email protected]>
Signed-off-by: Cary Phillips <[email protected]>
Signed-off-by: Cary Phillips <[email protected]>
Signed-off-by: Cary Phillips <[email protected]>
meshula
reviewed
May 14, 2021
CMakeLists.txt
Outdated
set(IMATH_SOVERSION 28) | ||
set(IMATH_SOAGE 0) | ||
set(IMATH_SOREVISION 1) | ||
set(IMATH_LIB_VERSION "${IMATH_SOVERSION}.${IMATH_SOAGE}.${IMATH_SOREVISION}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same note about AGE/REVISION, I approved the other PR to resolve that
meshula
reviewed
May 14, 2021
@@ -46,6 +46,9 @@ | |||
(uint32_t(IMATH_VERSION_MINOR) << 16) | \ | |||
(uint32_t(IMATH_VERSION_PATCH) << 8)) | |||
|
|||
// IMATH_LIB_VERSION is the library API version: SOCURRENT.SOAGE.SOREVISION |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same
meshula
approved these changes
May 14, 2021
…cademySoftwareFoundation#142) Revision comes before age. Signed-off-by: Cary Phillips <[email protected]>
Signed-off-by: Cary Phillips <[email protected]>
meshula
approved these changes
May 16, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.