From dd74dd05a055cb882388862f8a3fe6e3ba4b194b Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Fri, 19 Nov 2021 23:55:09 +1300
Subject: CMake: add option USE_CCACHE=OFF to use ccache to compile C/C++ objs

---
 travis/install.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'travis')

diff --git a/travis/install.sh b/travis/install.sh
index d0b4d9cb..8a9a6f72 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -139,11 +139,24 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
     VERBOSE=1 make >/dev/null
     cd ../..
 
+    # Use ccache if it's available
+    if command -v ccache &> /dev/null
+    then
+        USE_CCACHE=ON
+        ccache -s
+    else
+        USE_CCACHE=OFF
+    fi
+
     # Regular build
     mkdir build_cmake
     cd build_cmake
-    cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install
-    VERBOSE=1 make >/dev/null
+    cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install -DUSE_CCACHE=${USE_CCACHE}
+    make >/dev/null
+    if [ "$USE_CCACHE" = "ON" ]; then
+        ccache -s
+    fi
+
     make install >/dev/null
     ctest
     find /tmp/proj_cmake_install
-- 
cgit v1.2.3


From 4889dcfa71505939966e119baa9449be189abaaf Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Thu, 25 Nov 2021 11:21:09 +1300
Subject: Also look for clcache for MSVC; only use wrappers for Xcode

---
 travis/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'travis')

diff --git a/travis/install.sh b/travis/install.sh
index 8a9a6f72..916f554d 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -153,7 +153,7 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
     cd build_cmake
     cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install -DUSE_CCACHE=${USE_CCACHE}
     make >/dev/null
-    if [ "$USE_CCACHE" = "ON" ]; then
+    if [ "${USE_CCACHE}" = "ON" ]; then
         ccache -s
     fi
 
-- 
cgit v1.2.3