- With all the cnages we dont need cmake.rules anymore, so try to
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:
parent
c51e9382c9
commit
9517bf9dfc
@ -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
|
||||
|
||||
|
@ -32,8 +32,7 @@
|
||||
-DBUILD_STATIC_LIBS:BOOL=OFF \\\
|
||||
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\
|
||||
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
|
||||
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\
|
||||
-DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake"
|
||||
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules
|
||||
|
||||
%make_jobs \
|
||||
%__make %{?_smp_mflags} VERBOSE=1
|
||||
|
@ -25,7 +25,6 @@ Group: Development/Tools/Building
|
||||
Url: http://www.cmake.org/
|
||||
Source0: http://www.cmake.org/files/v3.4/%{name}-%{version}.tar.gz
|
||||
Source1: cmake.macros
|
||||
Source2: opensuse_rules.cmake
|
||||
Source3: cmake.attr
|
||||
Source4: cmake.prov
|
||||
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
|
||||
# rpm macros
|
||||
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
|
||||
install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr
|
||||
|
@ -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)
|
Loading…
Reference in New Issue
Block a user