<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/43f492749f0d49a7f291ea286aa1c01595c2cc1c">https://github.com/macports/macports-ports/commit/43f492749f0d49a7f291ea286aa1c01595c2cc1c</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 43f4927 cmake-1.*: Ensure final compiler choice is used
</span>43f4927 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 43f492749f0d49a7f291ea286aa1c01595c2cc1c
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Mon Nov 28 21:03:41 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-1.*: Ensure final compiler choice is used
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modifying configure.args (by appending to it, perhaps) bakes in the
</span><span style='display:block; white-space:pre;color:#404040;'> current values of configure.cc and configure.cxx. If configure.compiler
</span><span style='display:block; white-space:pre;color:#404040;'> is subsequently modified, the new C and C++ compilers will not be passed
</span><span style='display:block; white-space:pre;color:#404040;'> to CMake.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since the CC and CXX environment variables will always be set properly
</span><span style='display:block; white-space:pre;color:#404040;'> at configure time, using them directly in the command invocation ensures
</span><span style='display:block; white-space:pre;color:#404040;'> that CMake will receive the correct information.
</span>---
_resources/port1.0/group/cmake-1.0.tcl | 4 ++--
_resources/port1.0/group/cmake-1.1.tcl | 4 ++--
2 files changed, 4 insertions(+), 4 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 9639dac..f074c62 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;'>@@ -75,8 +75,8 @@ default configure.args {[list \
</span> -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
-DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
-DCMAKE_FIND_FRAMEWORK=LAST \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_C_COMPILER=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_COMPILER=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-DCMAKE_C_COMPILER="$CC"} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-DCMAKE_CXX_COMPILER="$CXX"} \
</span> -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 f7c3cd0..fc179af 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;'>@@ -93,8 +93,8 @@ default configure.args {[list \
</span> -DCMAKE_MODULE_PATH=${cmake_share_module_dir} \
-DCMAKE_FIND_FRAMEWORK=LAST \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_C_COMPILER=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_COMPILER=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-DCMAKE_C_COMPILER="$CC"} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-DCMAKE_CXX_COMPILER="$CXX"} \
</span> -Wno-dev
]}
</pre><pre style='margin:0'>
</pre>