Merge remote-tracking branch 'origin/5.9.4' into 5.9

Conflicts: .gitmodules Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
zwjkim · Jan 5, 2018 · 89d4dec · 89d4dec
2 parents b9b259f + a742af9
commit 89d4dec
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/cmake_linux.sh
+