<pre style='margin:0'>
Lawrence Velázquez (larryv) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e104b733ba9e570c4d91a07554854bf510f82e00">https://github.com/macports/macports-ports/commit/e104b733ba9e570c4d91a07554854bf510f82e00</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e104b733ba9e570c4d91a07554854bf510f82e00
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Tue Nov 29 22:22:55 2016 -0500

<span style='display:block; white-space:pre;color:#404040;'>    cmake-1.1: Use proc to add rpath flags
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Set both BUILD_WITH_INSTALL_RPATH and INSTALL_PATH in response to the
</span><span style='display:block; white-space:pre;color:#404040;'>    value of cmake.install_rpath.
</span>---
 _resources/port1.0/group/cmake-1.1.tcl | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

<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 c3086fb..0a3da6e 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;'>@@ -34,6 +34,8 @@
</span> # Usage:
 # PortGroup     cmake 1.1
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+namespace eval cmake {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> options cmake.build_dir cmake.install_prefix cmake.install_rpath
 options cmake.out_of_source cmake.set_osx_architectures
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +50,15 @@ default cmake.set_osx_architectures {yes}
</span> default cmake.build_dir         {${workpath}/build}
 default cmake.install_prefix    {${prefix}}
 default cmake.install_rpath     {${prefix}/lib}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc cmake::rpath_flags {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[llength [option cmake.install_rpath]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -DCMAKE_INSTALL_RPATH='[join [option cmake.install_rpath] \;]'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 # standard place to install extra CMake modules
 set cmake_share_module_dir ${prefix}/share/cmake/Modules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +89,7 @@ default configure.pre_args {[list \
</span>                     -DCMAKE_VERBOSE_MAKEFILE=ON \
                     -DCMAKE_COLOR_MAKEFILE=ON \
                     -DCMAKE_BUILD_TYPE=MacPorts \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    {*}[cmake::rpath_flags] \
</span>                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
                     -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
                     -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,10 +182,6 @@ pre-configure {
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${cmake.install_rpath} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append -DCMAKE_INSTALL_RPATH="[join ${cmake.install_rpath} \;]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     # CMake doesn't like --enable-debug, so remove it unconditionally.
     configure.args-delete --enable-debug
 }
</pre><pre style='margin:0'>

</pre>