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

Clean up setting of Imath version #139

Merged
merged 4 commits into from
May 7, 2021

Conversation

cary-ilm
Copy link
Member

@cary-ilm cary-ilm commented May 6, 2021

  • 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 cary@ilm.com

* 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 <cary@ilm.com>
And removed EXACT since IMATH_VERSION includes IMATH_VERISON_EXTRA.

Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm merged commit 04fb58d into AcademySoftwareFoundation:master May 7, 2021
cary-ilm added a commit to cary-ilm/Imath that referenced this pull request May 13, 2021
* 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 <cary@ilm.com>

* 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 <cary@ilm.com>

* Bump SOVERSION to 28

Signed-off-by: Cary Phillips <cary@ilm.com>
cary-ilm added a commit that referenced this pull request May 16, 2021
* Lib version (#133)

* 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 <cary@ilm.com>

* Add comment explaining IMATH_LIB_VERSION

Signed-off-by: Cary Phillips <cary@ilm.com>

* Add section on python bindings (#135)

Signed-off-by: Cary Phillips <cary@ilm.com>

* Don't impose C++14 on downstream projects (#137)

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 <lg@larrygritz.com>

* Fix regression in succf()/predf() (#140)

And add more thorough test.

Signed-off-by: Cary Phillips <cary@ilm.com>

* Clean up setting of Imath version (#139)

* 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 <cary@ilm.com>

* 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 <cary@ilm.com>

* Bump SOVERSION to 28

Signed-off-by: Cary Phillips <cary@ilm.com>

* Release notes for v3.0.2

Signed-off-by: Cary Phillips <cary@ilm.com>

* Bump version for v3.0.2

Signed-off-by: Cary Phillips <cary@ilm.com>

* Adjust SOVERSION/SOREVISION for v3.0.2

Signed-off-by: Cary Phillips <cary@ilm.com>

* Change v3.0.2 release date to May 17

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix order of ${IMATH_SOVERSION}.${IMATH_SOREVISION}.${IMATH_SOAGE} (#142)

Revision comes before age.

Signed-off-by: Cary Phillips <cary@ilm.com>

* Changed release date of v3.0.2 to May 16

Signed-off-by: Cary Phillips <cary@ilm.com>

Co-authored-by: Larry Gritz <lg@larrygritz.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants