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

Fix InstallBasicPackageFiles preserving compatibility #112

Merged
merged 2 commits into from
Jan 27, 2017
Merged

Fix InstallBasicPackageFiles preserving compatibility #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc15ec
Fix InstallBasicPackageFiles preserving compatibility
claudiofantacci Jan 20, 2017
90260eb
Update release helper doc
claudiofantacci Jan 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions help/release/0.2.3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ Changes made since YCM 0.2.2 include the following.
Modules
=======

Generic Modules
---------------

* :module:`InstallBasicPackageFiles`: Fixed an error that was forcing the user
to set specific GLOBAL variables to properly export a project. Compatibility
is preserved. (#112)

Superbuild Helper Modules
-------------------------

Expand Down
11 changes: 8 additions & 3 deletions modules/InstallBasicPackageFiles.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,16 @@
#
# is defined, the ``<VARS_PREFIX>_<SUFFIX>`` variable will be defined
# before configuring the package. In order to use that variable in the
# config file, a line ou can access to that variable in the config
# file by using::
# config file, you have to add a line::
#
# set_and_check(<VARS_PREFIX>_<SUFFIX> \"@PACKAGE_<VARS_PREFIX>_<SUFFIX>@\")
#
# if the path must exist or just::
#
# set(<VARS_PREFIX>_<SUFFIX> \"@PACKAGE_<VARS_PREFIX>_<SUFFIX>@\")
#
# if the path could be missing.
#
# These variable will have different values whether you are using the
# package from the build tree or from the install directory. Also these
# files will contain only relative paths, meaning that you can move the
Expand Down Expand Up @@ -278,7 +283,7 @@ function(INSTALL_BASIC_PACKAGE_FILES _Name)

@PACKAGE_INIT@

set_and_check(${_IBPF_VARS_PREFIX}_INCLUDEDIR \"@PACKAGE_${_IBPF_VARS_PREFIX}_INCLUDEDIR@\")
set(${_IBPF_VARS_PREFIX}_INCLUDEDIR \"@PACKAGE_${_IBPF_VARS_PREFIX}_INCLUDEDIR@\")

if(NOT TARGET ${_target})
include(\"\${CMAKE_CURRENT_LIST_DIR}/${_targets_filename}\")
Expand Down