rpms/cmake
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %cmake (#474053)

Browse Source 
- preserve timestamp of macros.cmake
- cosmetics
This commit is contained in:
Rex Dieter 2008-12-02 17:46:08 +00:00
parent 3168adc2dd
commit 2dd88b1751
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake.spec
View File

@ -26,8 +26,6 @@ BuildRequires: xmlrpc-c-devel
%if %{with gui} %if %{with gui}
BuildRequires: qt4-devel, desktop-file-utils BuildRequires: qt4-devel, desktop-file-utils
%define qt_gui --qt-gui %define qt_gui --qt-gui
%else
%define qt_gui %{nil}
%endif %endif
Requires: rpm Requires: rpm
@ -41,7 +39,6 @@ to support complex environments requiring system configuration, pre-processor
generation, code generation, and template instantiation. generation, code generation, and template instantiation.
%if %{with gui}
%package gui %package gui
Summary: Qt GUI for %{name} Summary: Qt GUI for %{name}
Group: Development/Tools Group: Development/Tools
@ -49,7 +46,6 @@ Requires: %{name} = %{version}-%{release}
%description gui %description gui
The %{name}-gui package contains the Qt based GUI for CMake. The %{name}-gui package contains the Qt based GUI for CMake.
%endif
%prep %prep
@ -65,7 +61,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
--docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \ --%{?with_bootstrap:no-}system-libs \
--parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
%{qt_gui} %{?qt_gui}
make VERBOSE=1 %{?_smp_mflags} make VERBOSE=1 %{?_smp_mflags}
@ -77,8 +73,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/ cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
# RPM macros # RPM macros
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
%if %{with gui} %if %{with gui}
# Desktop file # Desktop file
desktop-file-install --delete-original \ desktop-file-install --delete-original \
@ -130,6 +125,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Tue Dec 2 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.6.2-3
- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053)
- preserve timestamp of macros.cmake
- cosmetics
* Tue Oct 21 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.2-2 * Tue Oct 21 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.2-2
- Allow conditional build of gui - Allow conditional build of gui

1
macros.cmake
View File

@ -9,6 +9,7 @@
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
%__cmake \\\ %__cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\