-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
boost: Fix library and include paths in generated cmake files
Boost generates its installed cmake configuration using custom logic in its own build system; while this logic *knows* where it should be installed, the generated config overrides the correct information with new paths based on the location of the cmake configuration file in an attempt to let the package be relocated after installation. This patch simply undoes that. (cherry picked from commit 777df0b)
- Loading branch information
Showing
2 changed files
with
23 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam | ||
index ad19f7b55..ec6bf57ff 100644 | ||
--- a/tools/boost_install/boost-install.jam | ||
+++ b/tools/boost_install/boost-install.jam | ||
@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) | ||
"# Compute the include and library directories relative to this file." | ||
"" | ||
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" | ||
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" | ||
: true ; | ||
|
||
if [ path.is-rooted $(cmakedir) ] | ||
@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) | ||
" unset(_BOOST_CMAKEDIR_ORIGINAL)" | ||
"endif()" | ||
"" | ||
+ "# Assume that the installer actually did know where the libs were to be installed" | ||
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" | ||
: true ; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters