Skip to content

Commit

Permalink
Fix handling of PRIVATE_DEPENDENCIES in install_basic_package_files
Browse files Browse the repository at this point in the history
Before the commit the PRIVATE_DEPENDENCIES argument of
install_basic_package_files was ignored unless DEPENDENCIES was also set.
  • Loading branch information
traversaro committed Jul 14, 2020
1 parent 17eaca4 commit 463316d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions help/release/0.11.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Changes made since YCM 0.11.1 include the following.
Modules
=======

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

* :module:`InstallBasicPackageFiles`: Fixed handling of PRIVATE_DEPENDENCIES
in install_basic_package_files. (#339)

3rd Party
---------

Expand Down
2 changes: 1 addition & 1 deletion modules/InstallBasicPackageFiles.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ ${_compatibility_vars}
endif()

unset(PACKAGE_DEPENDENCIES)
if(DEFINED _IBPF_DEPENDENCIES)
if(DEFINED _IBPF_DEPENDENCIES OR (DEFINED _IBPF_PRIVATE_DEPENDENCIES AND _need_private_deps))
set(PACKAGE_DEPENDENCIES "#### Expanded from @PACKAGE_DEPENDENCIES@ by install_basic_package_files() ####\n\ninclude(CMakeFindDependencyMacro)\n")

# FIXME When CMake 3.9 or greater is required, remove this madness and just
Expand Down

0 comments on commit 463316d

Please sign in to comment.