646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
|
|
index 4238f921e..8fc1ea269 100644
|
|
--- a/tools/boost_install/boost-install.jam
|
|
+++ b/tools/boost_install/boost-install.jam
|
|
@@ -649,7 +649,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}/../\" REALPATH)"
|
|
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
|
: true ;
|
|
|
|
if [ path.is-rooted $(cmakedir) ]
|
|
@@ -668,6 +668,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 ;
|
|
}
|
|
|