pool/cmake
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- With all the cnages we dont need cmake.rules anymore, so try to

Browse Source 
remove them completely and lets see what fails

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=234
This commit is contained in:
Tomáš Chvátal 2015-12-03 09:46:18 +00:00 committed by Git OBS Bridge
parent c51e9382c9
commit 9517bf9dfc
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 3 09:40:02 UTC 2015 - tchvatal@suse.com
- With all the cnages we dont need cmake.rules anymore, so try to
remove them completely and lets see what fails
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 1 20:27:34 UTC 2015 - tchvatal@suse.com Tue Dec 1 20:27:34 UTC 2015 - tchvatal@suse.com

3
cmake.macros
View File

@ -32,8 +32,7 @@
-DBUILD_STATIC_LIBS:BOOL=OFF \\\ -DBUILD_STATIC_LIBS:BOOL=OFF \\\
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\ -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules
-DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake"
%make_jobs \ %make_jobs \
%__make %{?_smp_mflags} VERBOSE=1 %__make %{?_smp_mflags} VERBOSE=1

6
cmake.spec
View File

@ -25,7 +25,6 @@ Group: Development/Tools/Building
Url: http://www.cmake.org/ Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.4/%{name}-%{version}.tar.gz Source0: http://www.cmake.org/files/v3.4/%{name}-%{version}.tar.gz
Source1: cmake.macros Source1: cmake.macros
Source2: opensuse_rules.cmake
Source3: cmake.attr Source3: cmake.attr
Source4: cmake.prov Source4: cmake.prov
Source5: http://www.cmake.org/files/v3.4/%{name}-%{version}-SHA-256.txt Source5: http://www.cmake.org/files/v3.4/%{name}-%{version}-SHA-256.txt
@ -90,11 +89,6 @@ mkdir -p %{buildroot}%{_libdir}/cmake
find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644 find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
# rpm macros # rpm macros
install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake
# buildrules
install -m644 %{SOURCE2} -D %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
sed -i \
-e 's:OPTFLAGS:%{optflags}:g' \
%{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake
# RPM auto provides # RPM auto provides
install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr

6
opensuse_rules.cmake
View File

@ -1,6 +0,0 @@
SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE)
SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> OPTFLAGS <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>" 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)