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.

Sign up for GitHub

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

Jump to bottom

Sma/rework cmake module #57

Open
wants to merge 4 commits into
base: devel
Choose a base branch
from
Open

Sma/rework cmake module #57

wants to merge 4 commits into from

Commits on May 5, 2014

  1. dynamicEDT3D: install CMake module under share/dynamicEDT3D/ 

    dynamicEDT3D was the only subproject installing its CMake module files
under lib/cmake/.
This patch cleans this up, making dynamicEDT3D installation consistent with
the octomap and octovis ones.
    @tSed
    tSed committed May 5, 2014
    Configuration menu
    Copy the full SHA
    321cc78 View commit details
    Browse the repository at this point in the history

  2. dynamicEDT3D: rename CMake module file names 

    dynamicEDT3D was the only subproject naming its CMake module files
<project name>Config.cmake.
This patch cleans this up, using the <project name>-config.cmake pattern;
so make dynamicEDT3D consistent with what is done for octomap and octovis.
    @tSed
    tSed committed May 5, 2014
    Configuration menu
    Copy the full SHA
    3af3ddc View commit details
    Browse the repository at this point in the history

  3. cmake: offer CMake modules with no hard-coded path 

    Hardcoding absolute install paths in the CMake module files totally
breaks the cross-compilation: it makes impossible to be used in a
sysroot because the hardcoded paths are the ones of the target, whereas
they should point to the sysroot location. This tootally breaks the
CMake FIND_ROOT_PATH mechanism designed to handle cross-compilation.

This patch introduces a new CMake variable: NO_ABSOLUTE_PATH_IN_MODULE,
which, when set on the cmake command-line, will enable the installation
of the CMake module files using the CMake primitives find_library and
find_path to set the libraries and headers' locations, instead of
hard-coding them.

Thus, this patch adds non-templated CMake module files for octomap,
dynamicEDT3D and octovis for the non hard-coded path version of the
modules.

In any way, only the installed CMake module files are changed. The
templated ones are still needed for combined package build.

The non hard-coded path version of the modules are only installed when
NO_ABSOLUTE_PATH_IN_MODULE is set; by default the existing behavior
remains unchanged to keep honoring the behavior described in [1].

[1] OctoMap#57 (comment)
    @tSed
    tSed committed May 5, 2014
    Configuration menu
    Copy the full SHA
    9c0885a View commit details
    Browse the repository at this point in the history

  4. cmake: cleanup trailing whitespaces

    @tSed
    tSed committed May 5, 2014
    Configuration menu
    Copy the full SHA
    3c55cb2 View commit details
    Browse the repository at this point in the history