Gotta handle old versions of Xcode that don’t know anything about that.

alexupiita · Apr 17, 2017 · 2b2397a · 2b2397a
1 parent 109f5c8
commit 2b2397a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/QGCCommon.pri b/QGCCommon.pri
@@ -200,7 +200,9 @@ MacBuild | LinuxBuild {
         # Latest clang version has a buggy check for this which cause Qt headers to throw warnings on qmap.h
         QMAKE_CXXFLAGS_WARN_ON += -Wno-return-stack-address
         # Xcode 8.3 has issues on how MAVLink accesses (packed) message structure members.
-        QMAKE_CXXFLAGS_WARN_ON += -Wno-address-of-packed-member
+        # Note that this will fail when Xcode version reaches 10.x.x
+        XCODE_VERSION = $$system($$PWD/tools/get_xcode_version.sh)
+        greaterThan(XCODE_VERSION, 8.2.0): QMAKE_CXXFLAGS_WARN_ON += -Wno-address-of-packed-member
     }
 }
 

diff --git a/tools/get_xcode_version.sh b/tools/get_xcode_version.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+xcodebuild -version 2>&1 | (head -n1) | awk  '{print $2}'
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash
		xcodebuild -version 2>&1 \| (head -n1) \| awk '{print $2}'