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

[CMake] Rework sofa_generate_package #951

Merged

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Feb 26, 2019

This PR follows @marques-bruno work on #909

  • add INCLUDE_SOURCE_DIR parameter to sofa_generate_package
  • rename INCLUDE_ROOT_DIR to INCLUDE_INSTALL_DIR (avoid confusion with INCLUDE_SOURCE_DIR)

The idea is to permit this:

sofa_generate_package(
    NAME SofaSparseSolver 
    VERSION ${PROJECT_VERSION} 
    TARGETS SofaSparseSolver
    INCLUDE_SOURCE_DIR "src/SofaSparseSolver"
    INCLUDE_INSTALL_DIR "SofaSparseSolver/SofaSparseSolver"
    )

to obtain for example an install tree like this

install
    include <-- include_directories here exposes ALL module headers
        SofaBaseTopology
                header.h
        SofaSparseSolver <-- include_directories here exposes ONLY SofaSparseSolver headers
            SofaSparseSolver
                header.h
        SofaValidation
                header.h
        ...

which is needed if we want to cleanly separate SOFA include directories.

In a future PR I'd like to rework all SOFA install tree based on this INCLUDE_SOURCE_DIR + INCLUDE_INSTALL_DIR mechanism.


This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

and RENAME INCLUDE_ROOT_DIR to INCLUDE_INSTALL_DIR
@guparan guparan added enhancement About a possible enhancement pr: status to review To notify reviewers to review this pull-request labels Feb 26, 2019
@guparan
Copy link
Contributor Author

guparan commented Feb 27, 2019

TODO: add INCLUDE_INSTALL_DIR to INCLUDE_ROOT_DIR backward compat

EDIT: done!

@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Feb 27, 2019
@guparan guparan added pr: status to review To notify reviewers to review this pull-request pr: status ready Approved a pull-request, ready to be squashed and removed pr: status wip Development in the pull-request is still in progress pr: status to review To notify reviewers to review this pull-request labels Mar 1, 2019
@guparan
Copy link
Contributor Author

guparan commented Mar 6, 2019

[ci-build][with-scene-tests]

@damienmarchal
Copy link
Contributor

Ready...go

@damienmarchal damienmarchal merged commit 96faeb7 into sofa-framework:master Mar 12, 2019
@guparan guparan added this to the v19.06 milestone Jun 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement About a possible enhancement pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants