<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa7974d735e1af45201ab5428a7c3afa37c29444">https://github.com/macports/macports-ports/commit/aa7974d735e1af45201ab5428a7c3afa37c29444</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 aa7974d cmake-1.[01].tcl: Ensure that cmake based ports use the correct compiler
</span>aa7974d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa7974d735e1af45201ab5428a7c3afa37c29444
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Mon Nov 28 02:23:18 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> cmake-1.[01].tcl: Ensure that cmake based ports use the correct compiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/52970
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span><span style='display:block; white-space:pre;color:#404040;'> Tested-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 | 16 ++++------------
2 files changed, 9 insertions(+), 13 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 5bde2f3..9639dac 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;'>@@ -65,7 +65,8 @@ configure.cmd ${prefix}/bin/cmake
</span>
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -DCMAKE_VERBOSE_MAKEFILE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.args {[list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_VERBOSE_MAKEFILE=ON \
</span> -DCMAKE_COLOR_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +75,10 @@ configure.args -DCMAKE_VERBOSE_MAKEFILE=ON \
</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:#e0ffe0;'>+ -DCMAKE_C_COMPILER=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_COMPILER=${configure.cxx} \
</span> -Wno-dev
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]}
</span>
default configure.post_args {${worksrcpath}}
<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 30fb8da..f7c3cd0 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;'>@@ -83,7 +83,7 @@ configure.cmd ${prefix}/bin/cmake
</span>
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.args {[list \
</span> -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_COLOR_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=MacPorts \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,10 @@ configure.args \
</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:#e0ffe0;'>+ -DCMAKE_C_COMPILER=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_COMPILER=${configure.cxx} \
</span> -Wno-dev
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]}
</span>
default configure.post_args {${worksrcpath}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,17 +145,6 @@ pre-configure {
</span> # but why do we set -DNDEBUG?
configure.cflags-append -DNDEBUG
configure.cxxflags-append -DNDEBUG
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # force newer CMake versions to take a change in compiler choice into account
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # even if it is invoked in a build.dir that was configured before.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cc} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_C_COMPILER=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_COMPILER=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>
# process ${configure.cppflags} to extract include directives and other options
if {${configure.cppflags} ne ""} {
</pre><pre style='margin:0'>
</pre>