From 7c064878d8da23df2965e24a5ccb1644a7f7d2cb88a209bebe63d1d3e3c6b777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Mar 2015 20:30:21 +0000 Subject: [PATCH] - Add path back as it breaks some builds when using relative path OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=200 --- cmake.changes | 5 +++++ opensuse_rules.cmake | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 1a14d79..aa52113 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 5 20:30:03 UTC 2015 - tchvatal@suse.com + +- Add path back as it breaks some builds when using relative path + ------------------------------------------------------------------- Thu Mar 5 13:16:59 UTC 2015 - tchvatal@suse.com diff --git a/opensuse_rules.cmake b/opensuse_rules.cmake index 7d5e4aa..9a29bcd 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 cc CACHE FILEPATH "C compiler" FORCE) +SET (CMAKE_C_COMPILER /usr/bin/cc CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT " -o -c " CACHE STRING "C compile command" FORCE) -SET (CMAKE_CXX_COMPILER c++ CACHE FILEPATH "C++ compiler" FORCE) +SET (CMAKE_CXX_COMPILER /usr/bin/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)