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

Simplify CMake library version declarations and configure include_directories for BUILD_INTERFACE and INSTALL_INTERFACE #316

Merged
merged 3 commits into from Aug 22, 2022

Conversation

eaaltonen
Copy link
Contributor

Two CMake fix commits originally from the start of #259 (stale).

  • The version handling simplifies the CMake build a bit.
  • BUILD_INTERFACE and INSTALL_INTERFACE are related to configuring paths differently for the build tree and install tree (used if/when a CMake config-file package is added).

These don't depend on libuuid, so can be brought in before those changes.

Refreshed with fixup commits for changes since last year.

Setting in the version in the `project()` call automatically populates
the variables `PROJECT_VERSION_MAJOR`, `_MINOR`, `_PATCH` and `_TWEAK`
(if used).

If a `SHARED` version of `ckteec` is built, `PROJECT_VERSION_MAJOR` can
be used for the `SOVERSION`.

Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
Acked-by: Jerome Forissier <jerome@forissier.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
@eaaltonen
Copy link
Contributor Author

@etienne-lms: FYI I squashed the fixup (refresh) commits, but kept your Reviewed-by line.

@jforissier
Copy link
Contributor

For commit "Remove setting include_directory for teec": do you mean libseteec rather than teec?

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

@eaaltonen eaaltonen force-pushed the cmake-fixes branch 2 times, most recently from 775b233 to 42e1797 Compare August 17, 2022 14:30
@eaaltonen
Copy link
Contributor Author

For commit "Remove setting include_directory for teec": do you mean libseteec rather than teec?

Re-phrased to
Don't set teec include_directory from libseteec
Hopefully that's more clear.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>

And also added Acked-by.

@jforissier
Copy link
Contributor

Would you mind adding a cmake: prefix to the last two commits? Thanks.

Seems to be unused, and CMake builds are easier to reason about, if
each subdirectory only configures targets located within itself.

Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
A separate generator expression allows to refer to the headers from the
same build tree.

Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
@eaaltonen
Copy link
Contributor Author

Would you mind adding a cmake: prefix to the last two commits? Thanks.

Not at all; and done. As long as you don't mind the slightly longer summary line.

@eaaltonen eaaltonen closed this Aug 18, 2022
@eaaltonen eaaltonen reopened this Aug 18, 2022
@jforissier jforissier merged commit 30abe6c into OP-TEE:master Aug 22, 2022
@eaaltonen eaaltonen deleted the cmake-fixes branch October 19, 2023 09:33
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.

None yet

2 participants