testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 290267 from home:scarabeus_iv

Browse Source 
- 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
This commit is contained in:
Tomáš Chvátal 2015-03-11 10:25:03 +00:00 committed by Git OBS Bridge
parent 330549628a
commit c8eedc1eeb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake.changes
View File

@ -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 Fri Mar 6 12:47:35 UTC 2015 - tchvatal@suse.com

2
opensuse_rules.cmake
View File

@ -1,8 +1,6 @@
SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE)
SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> OPTFLAGS <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> OPTFLAGS <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
SET (CMAKE_C_COMPILER cc CACHE FILEPATH "C compiler" FORCE)
SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
SET (CMAKE_CXX_COMPILER c++ CACHE FILEPATH "C++ compiler" FORCE)
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
SET (CMAKE_RANLIB /usr/bin/ranlib CACHE FILEPATH "Archive index generator" 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) SET (PKG_CONFIG_EXECUTABLE /usr/bin/pkg-config CACHE FILEPATH "pkg-config executable" FORCE)