<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50879243ac9fe84c22bf7772580ca036513a1adc">https://github.com/macports/macports-ports/commit/50879243ac9fe84c22bf7772580ca036513a1adc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5087924 cmake: Use $cmake.install_prefix for CMAKE_INSTALL_NAME_DIR, CMAKE_INSTALL_RPATH, and CMAKE_SYSTEM_PREFIX_PATH
</span>5087924 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 50879243ac9fe84c22bf7772580ca036513a1adc
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Dec 18 18:46:31 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> cmake: Use $cmake.install_prefix for CMAKE_INSTALL_NAME_DIR, CMAKE_INSTALL_RPATH, and CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
_resources/port1.0/group/cmake-1.0.tcl | 6 +++---
_resources/port1.0/group/cmake-1.1.tcl | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.0.tcl b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ea43f59..5bd9ce3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,10 +78,10 @@ default configure.args {[list \
</span> -DCMAKE_COLOR_MAKEFILE=ON \
{-DCMAKE_CXX_COMPILER="$CXX"} \
-DCMAKE_FIND_FRAMEWORK=LAST \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_RPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_RPATH=${cmake.install_prefix}/lib \
</span> -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr" \
</span> -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_POLICY_DEFAULT_CMP0025=NEW \
-Wno-dev
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.1.tcl b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fcaa5fc..37f0a77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ default cmake.set_osx_architectures {yes}
</span>
default cmake.build_dir {${workpath}/build}
default cmake.install_prefix {${prefix}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.install_rpath {${prefix}/lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.install_rpath {${cmake.install_prefix}/lib}
</span> proc cmake::rpath_flags {} {
if {[llength [option cmake.install_rpath]]} {
return [list \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,11 +97,11 @@ default configure.pre_args {[list \
</span> {-DCMAKE_CXX_COMPILER="$CXX"} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_FIND_FRAMEWORK=LAST \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span> -DCMAKE_INSTALL_PREFIX='${cmake.install_prefix}' \
-DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
{*}[cmake::rpath_flags] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr" \
</span> -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_POLICY_DEFAULT_CMP0025=NEW \
-Wno-dev
</pre><pre style='margin:0'>
</pre>