OpenEXRConfig.h.in uses version extracted from openexr_version.h #1527
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
The logic was already in place to extract the version from `openexr_version.h`, so the `.in` file just needed to reference the proper CMake variables. This also duplicates the `OpenEXR_VERSION_*` settings to `OPENEXR_VERSION_*`. Signed-off-by: Cary Phillips <cary@ilm.com>
|
@Vertexwahn, is there a straightforward way to propagate the version info from |
Signed-off-by: Cary Phillips <cary@ilm.com>
|
Also added a fix for messy formatting of the version test error message in OpenEXRCoreTest, it was including unnecessary quotes around the "extra" part. |
meshula
approved these changes
Aug 28, 2023
Signed-off-by: Cary Phillips <cary@ilm.com>
cary-ilm
added a commit
that referenced
this pull request
Aug 28, 2023
* OpenEXRConfig.h.in uses version extracted from openexr_version.h The logic was already in place to extract the version from `openexr_version.h`, so the `.in` file just needed to reference the proper CMake variables. This also duplicates the `OpenEXR_VERSION_*` settings to `OPENEXR_VERSION_*`. Signed-off-by: Cary Phillips <cary@ilm.com> * bazel Signed-off-by: Cary Phillips <cary@ilm.com> * comment Signed-off-by: Cary Phillips <cary@ilm.com> * fix formatting of core version test error message Signed-off-by: Cary Phillips <cary@ilm.com> * fix extra comparison test Signed-off-by: Cary Phillips <cary@ilm.com> --------- Signed-off-by: Cary Phillips <cary@ilm.com>
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.
The logic was already in place to extract the version from
openexr_version.hin the root-level CMakeLists.txt, so theOpenEXRConfig.h.infile just needs to reference the proper CMake variables for configuration.This is still a bit awkward, since it would be better to simply
#include "openexr_version.h"fromOpenEXRConfig.h, but the cmake configuration doesn't readily allow that.The alternative of simply stripping all version #define's from
OpenEXRConfig.h.inand the requiring an#include "openexr_version.h"for access to the version is a cleaner option, but might break existing application code, so consider the settings inOpenEXRConfig.h.inas backwards compatibility.This also duplicates the
OpenEXR_VERSION_*CMake settings toOPENEXR_VERSION_*.