[112840] trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

[jeremyhu at macports.org]

Revision: 112840
          https://trac.macports.org/changeset/112840
Author:   jeremyhu at macports.org
Date:     2013-11-02 10:22:32 -0700 (Sat, 02 Nov 2013)
Log Message:
-----------
cmake: Honor configure.cxx_stdlib

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2013-11-02 17:19:53 UTC (rev 112839)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2013-11-02 17:22:32 UTC (rev 112840)
@@ -83,13 +83,19 @@
     # assertions in release builds!
     configure.args-append -DCMAKE_C_FLAGS_RELEASE="${configure.cflags}"
 }
-if {${configure.cxxflags} != ""} {
+set cxx_stdlibflags {}
+if {[info exists configure.cxx_stdlib] &&
+    ${configure.cxx_stdlib} ne {} &&
+    [string match *clang* ${configure.cxx}]} {
+    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
+}
+if {${configure.cxxflags} != "" || ${cxx_stdlibflags} != ""} {
     # The configure.cxxflags contain configure.optflags by default. Therefore,
     # we set the Release flags, which would otherwise overrule the optimization
     # flags, as they are set by default to "-O3 -NDEBUG". Therefore, be sure
     # to add "-NDEBUG" to the configure.cflags if you want to turn off
     # assertions in release builds!
-    configure.args-append -DCMAKE_CXX_FLAGS_RELEASE="${configure.cxxflags}"
+    configure.args-append -DCMAKE_CXX_FLAGS_RELEASE="${configure.cxxflags} ${cxx_stdlibflags}"
 }
 if {${configure.ldflags} != ""} {
     # CMake supports individual linker flags for executables, modules, and dlls.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131102/8a48805d/attachment.html>