packages: rpm-build-macros/rpm.macros - more cmake defaults, inspired from ...

glen glen at pld-linux.org
Fri Oct 15 07:29:10 CEST 2010


Author: glen                         Date: Fri Oct 15 05:29:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more cmake defaults, inspired from fc macros.cmake

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.585 -> 1.586) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.585 packages/rpm-build-macros/rpm.macros:1.586
--- packages/rpm-build-macros/rpm.macros:1.585	Fri Oct 15 07:26:04 2010
+++ packages/rpm-build-macros/rpm.macros	Fri Oct 15 07:29:04 2010
@@ -249,11 +249,18 @@
 CXXFLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \\\
 LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \\\
 %{__cmake} \\\
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
+	-DCMAKE_VERBOSE_MAKEFILE=ON \\\
 	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \\\
+	-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
+	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+	-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
+	-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
+	-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
+	-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
 %if "%{_lib}" == "lib64" \
 	-DLIB_SUFFIX=64 \\\
 %endif \
+	-DBUILD_SHARED_LIBS:BOOL=ON \\\
 %{nil}
 
 %scons { \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.585&r2=1.586&f=u



More information about the pld-cvs-commit mailing list