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

Strip CMAKE_INSTALL_LIBDIR and others from %cmake macro (bug 795542)

Browse Source
This commit is contained in:
Orion Poplawski 2012-02-21 15:27:33 -07:00
parent e9e494137f
commit 2273177e80
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.spec
View File

@ -8,7 +8,7 @@
Name: cmake Name: cmake
Version: 2.8.7 Version: 2.8.7
Release: 4%{?dist} Release: 5%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Tue Feb 21 2012 Orion Poplawski <orion@cora.nwra.com> - 2.8.7-5
- Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542)
* Thu Jan 26 2012 Tomas Bzatek <tbzatek@redhat.com> - 2.8.7-4 * Thu Jan 26 2012 Tomas Bzatek <tbzatek@redhat.com> - 2.8.7-4
- Rebuilt for new libarchive - Rebuilt for new libarchive

8
macros.cmake
View File

@ -14,12 +14,4 @@
%__cmake \\\ %__cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
%if "%{?_lib}" == "lib64" \
%{?_cmake_lib_suffix64} \\\
%endif \
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON