<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5add9faceca1d25655a067af55128ce0a09fab98">https://github.com/macports/macports-ports/commit/5add9faceca1d25655a067af55128ce0a09fab98</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 5add9faceca cmake 1.1 PG: Add flag to enable/disable c/c++ standard setting. Default on
</span>5add9faceca is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 5add9faceca1d25655a067af55128ce0a09fab98
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Jun 17 10:12:43 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    cmake 1.1 PG: Add flag to enable/disable c/c++ standard setting. Default on
</span>---
 _resources/port1.0/group/cmake-1.1.tcl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 22cd4f0d19c..13e3053f663 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;'>@@ -18,7 +18,9 @@ options                             cmake.build_dir \
</span>                                     cmake.module_path \
                                     cmake_share_module_dir \
                                     cmake.out_of_source \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    cmake.set_osx_architectures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    cmake.set_osx_architectures \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    cmake.set_c_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    cmake.set_cxx_standard
</span> 
 ## Explanation of and default values for the options defined above ##
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +55,10 @@ default cmake_share_module_dir      {${prefix}/share/cmake/Modules}
</span> # cmake.module_path; they come after ${cmake_share_module_dir}
 default cmake.module_path           {}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Propagate c/c++ standards to the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.set_c_standard        yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cmake.set_cxx_standard      yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # CMake provides several different generators corresponding to different utilities
 # (and IDEs) used for building the sources. We support "Unix Makefiles" (the default)
 # and Ninja, a leaner-and-meaner alternative.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,14 +436,14 @@ platform darwin {
</span>         }
 
         # C/C++ standard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${compiler.cxx_standard} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[option cmake.set_cxx_standard] && ${compiler.cxx_standard} ne ""} {
</span>             # https://cmake.org/cmake/help/latest/prop_tgt/CXX_STANDARD.html
             if {${compiler.cxx_standard} < 1998} {
                 compiler.cxx_standard 1998
             }
             configure.args-append -DCMAKE_CXX_STANDARD=[string range ${compiler.cxx_standard} end-1 end]
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${compiler.c_standard} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[option cmake.set_c_standard] && ${compiler.c_standard} ne ""} {
</span>             # Base defaults to 1989 which is not valid as a C standard
             # (at least as far as CMake is concerned)
             # https://cmake.org/cmake/help/latest/prop_tgt/C_STANDARD.html#prop_tgt:C_STANDARD
</pre><pre style='margin:0'>

</pre>