packages: rpm-build-macros/rpm.macros - use our own build type in cmake

draenog draenog at pld-linux.org
Thu Feb 3 17:38:31 CET 2011


Author: draenog                      Date: Thu Feb  3 16:38:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use our own build type in cmake

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.603 -> 1.604) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.603 packages/rpm-build-macros/rpm.macros:1.604
--- packages/rpm-build-macros/rpm.macros:1.603	Mon Jan 31 16:50:21 2011
+++ packages/rpm-build-macros/rpm.macros	Thu Feb  3 17:38:26 2011
@@ -245,23 +245,21 @@
 %{?__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_VERBOSE_MAKEFILE=ON \\\
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \\\
+	-DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?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} \\\
-	-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \\\
-	-DCMAKE_CPP_FLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
-	-DCMAKE_C_FLAGS="${CFLAGS:-%{rpmcflags}}" \\\
+	-DCMAKE_CXX_FLAGS_PLD="${CXXFLAGS:-%{rpmcxxflags}}" \\\
+	-DCMAKE_C_FLAGS_PLD="${CFLAGS:-%{rpmcflags}}" \\\
+	-DCMAKE_Fortran_FLAGS_PLD="${CFLAGS:-%{rpmcflags}}" \\\
+	-DCMAKE_EXE_LINKER_FLAGS_PLD="${LDFLAGS:-%{rpmldflags}}" \\\
+	-DCMAKE_SHARED_LINKER_FLAGS_PLD="${LDFLAGS:-%{rpmldflags}}" \\\
+	-DCMAKE_MODULE_LINKER_FLAGS_PLD="${LDFLAGS:-%{rpmldflags}}" \\\
 %if "%{_lib}" == "lib64" \
 	-DLIB_SUFFIX=64 \\\
 %endif \
================================================================

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



More information about the pld-cvs-commit mailing list