packages: rpm-build-macros/rpm.macros - set all flags in %cmake, like in %c...

[glen]

Author: glen                         Date: Fri Oct 15 05:26:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- set all flags in %cmake, like in %configure

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

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.584 packages/rpm-build-macros/rpm.macros:1.585
--- packages/rpm-build-macros/rpm.macros:1.584	Thu Oct 14 10:45:45 2010
+++ packages/rpm-build-macros/rpm.macros	Fri Oct 15 07:26:04 2010
@@ -240,11 +240,14 @@
 }
 
 %cmake \
-CC="%{__cc}" \\\
-CXX="%{__cxx}" \\\
-CFLAGS="%{rpmcflags}" \\\
-CXXFLAGS="%{rpmcxxflags}" \\\
-LDFLAGS="%{rpmldflags}" \\\
+%{?__cc:CC="%{__cc}"} \\\
+%{?__cxx:CXX="%{__cxx}"} \\\
+CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
+CFLAGS="${CFLAGS:-%{rpmcflags}}" \\\
+FFLAGS="${FFLAGS:-%{rpmcflags}}" \\\
+FCFLAGS="${FCFLAGS:-%{rpmcflags}}" \\\
+CXXFLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \\\
+LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \\\
 %{__cmake} \\\
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
 	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \\\
================================================================

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