From 6f1199d222c2dd1476bb55f938a74cc302f89707a6ec1f1d985edfa81ae03142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Mar 2015 13:17:25 +0000 Subject: [PATCH] - Try to remove full path from compiler to allow ccache override via path OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=199 --- cmake.changes | 6 ++++++ opensuse_rules.cmake | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 63b6582..1a14d79 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 5 13:16:59 UTC 2015 - tchvatal@suse.com + +- Try to remove full path from compiler to allow ccache override + via path + ------------------------------------------------------------------- Mon Feb 23 09:21:55 UTC 2015 - meissner@suse.com diff --git a/opensuse_rules.cmake b/opensuse_rules.cmake index a44a800..7d5e4aa 100644 --- a/opensuse_rules.cmake +++ b/opensuse_rules.cmake @@ -1,8 +1,8 @@ SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_ASM_COMPILE_OBJECT " OPTFLAGS -o -c " CACHE STRING "ASM compile command" FORCE) -SET (CMAKE_C_COMPILER /usr/bin/gcc CACHE FILEPATH "C compiler" FORCE) +SET (CMAKE_C_COMPILER cc CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT " -o -c " CACHE STRING "C compile command" FORCE) -SET (CMAKE_CXX_COMPILER /usr/bin/c++ CACHE FILEPATH "C++ compiler" FORCE) +SET (CMAKE_CXX_COMPILER c++ CACHE FILEPATH "C++ compiler" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT " -o -c " CACHE STRING "C++ compile command" FORCE) SET (CMAKE_RANLIB /usr/bin/ranlib CACHE FILEPATH "Archive index generator" FORCE) SET (PKG_CONFIG_EXECUTABLE /usr/bin/pkg-config CACHE FILEPATH "pkg-config executable" FORCE)