From c8eedc1eebb6f6a8a195778853e2f9c69ffb5b9edb28d49ad15fd479373f0f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Mar 2015 10:25:03 +0000 Subject: [PATCH] Accepting request 290267 from home:scarabeus_iv - Do not specify the compiler cc and c++ at all, it should be the default value and cmake expects full path in some cases. This should fix the failing build with error c++ not found in PATH OBS-URL: https://build.opensuse.org/request/show/290267 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=202 --- cmake.changes | 7 +++++++ opensuse_rules.cmake | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 36adf48..1d2ff5e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 11 10:16:22 UTC 2015 - tchvatal@suse.com + +- Do not specify the compiler cc and c++ at all, it should be the + default value and cmake expects full path in some cases. + This should fix the failing build with error c++ not found in PATH + ------------------------------------------------------------------- Fri Mar 6 12:47:35 UTC 2015 - tchvatal@suse.com diff --git a/opensuse_rules.cmake b/opensuse_rules.cmake index 7d5e4aa..e3759b1 100644 --- a/opensuse_rules.cmake +++ b/opensuse_rules.cmake @@ -1,8 +1,6 @@ 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_COMPILE_OBJECT " -o -c " CACHE STRING "C compile command" 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)