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

Accepting request 289674 from home:scarabeus_iv

Browse Source 
- Remove full path from compiler to allow ccache override
- This might break build if your package breaks $PATH content
- Tested on KDE and it build and some misc apps too.
  If something fails it should be fixed per app basis

OBS-URL: https://build.opensuse.org/request/show/289674
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=201
This commit is contained in:
Ismail Dönmez 2015-03-07 10:51:36 +00:00 committed by Git OBS Bridge
parent 7c064878d8
commit 330549628a
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake.changes
View File

@ -1,13 +1,11 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 5 20:30:03 UTC 2015 - tchvatal@suse.com Fri Mar 6 12:47:35 UTC 2015 - tchvatal@suse.com
- Add path back as it breaks some builds when using relative path - Remove full path from compiler to allow ccache override
-------------------------------------------------------------------
Thu Mar 5 13:16:59 UTC 2015 - tchvatal@suse.com
- Try to remove full path from compiler to allow ccache override
via path via path
- This might break build if your package breaks $PATH content
- Tested on KDE and it build and some misc apps too.
If something fails it should be fixed per app basis
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 23 09:21:55 UTC 2015 - meissner@suse.com Mon Feb 23 09:21:55 UTC 2015 - meissner@suse.com

2
cmake.spec
View File

@ -66,7 +66,7 @@ CMake is a cross-platform, open-source build system
%build %build
export CXXFLAGS="%{optflags}" export CXXFLAGS="%{optflags}"
export CFLAGS="$CXXFLAGS" export CFLAGS="%{optflags}"
./configure \ ./configure \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--datadir=/share/%{name} \ --datadir=/share/%{name} \

4
opensuse_rules.cmake
View File

@ -1,8 +1,8 @@
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 /usr/bin/cc CACHE FILEPATH "C compiler" 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 /usr/bin/c++ CACHE FILEPATH "C++ compiler" 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)