<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/20b0e7e272d2ada017cef34d92e5e28391022e1d">https://github.com/macports/macports-ports/commit/20b0e7e272d2ada017cef34d92e5e28391022e1d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20b0e7e272d2ada017cef34d92e5e28391022e1d
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Tue Nov 29 22:33:02 2016 -0500

<span style='display:block; white-space:pre;color:#404040;'>    cmake-1.*: Learn cmake.install_prefix option
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    It seems relatively common for portfiles to set their own value for
</span><span style='display:block; white-space:pre;color:#404040;'>    CMAKE_INSTALL_PREFIX. Instead of fiddling with configure.pre_args, they
</span><span style='display:block; white-space:pre;color:#404040;'>    should set cmake.install_prefix now.
</span>---
 _resources/port1.0/group/cmake-1.0.tcl |  9 +++++----
 _resources/port1.0/group/cmake-1.1.tcl | 13 ++++++-------
 2 files changed, 11 insertions(+), 11 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 10b2181..3028ce4 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;'>@@ -33,10 +33,11 @@
</span> # Usage:
 # PortGroup     cmake 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options cmake.out_of_source cmake.build_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cmake.build_dir cmake.install_prefix cmake.out_of_source
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.out_of_source no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.build_dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.build_dir         {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.install_prefix    {${prefix}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.out_of_source     {no}
</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;'>@@ -62,7 +63,7 @@ configure.ccache    no
</span> 
 configure.cmd       ${prefix}/bin/cmake
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args  -DCMAKE_INSTALL_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.pre_args {-DCMAKE_INSTALL_PREFIX='${cmake.install_prefix}'}
</span> 
 default configure.args {[list \
                     -DCMAKE_VERBOSE_MAKEFILE=ON \
<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 3ab8ffe..532033a 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,8 +34,8 @@
</span> # Usage:
 # PortGroup     cmake 1.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options cmake.out_of_source cmake.build_dir cmake.set_osx_architectures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-options cmake.install_rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cmake.build_dir cmake.install_prefix cmake.install_rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cmake.out_of_source cmake.set_osx_architectures
</span> 
 # make out-of-source builds the default (finally)
 default cmake.out_of_source {yes}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,9 @@ default cmake.out_of_source {yes}
</span> # that don't support the corresponding -arch options.
 default cmake.set_osx_architectures {yes}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cmake.build_dir             {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# minimal/initial value for the install rpath:
</span><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.build_dir         {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.install_prefix    {${prefix}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.install_rpath     {${prefix}/lib}
</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;'>@@ -74,7 +73,7 @@ configure.ccache    no
</span> 
 configure.cmd       ${prefix}/bin/cmake
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args  -DCMAKE_INSTALL_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.pre_args {-DCMAKE_INSTALL_PREFIX='${cmake.install_prefix}'}
</span> 
 default configure.args {[list \
                     -DCMAKE_VERBOSE_MAKEFILE=ON \
</pre><pre style='margin:0'>

</pre>