From 805999311e80566c5beadef9d52094c056c710cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Mon, 29 Sep 2014 17:40:34 +0200
Subject: RPM packaging: add cmake macros

---
 redhat/Makefile.r14                             |  5 ++++
 redhat/extras/trinity-cmake-macros/macros.cmake | 34 +++++++++++++++++++++++++
 redhat/macros.cmake                             | 34 -------------------------
 3 files changed, 39 insertions(+), 34 deletions(-)
 create mode 100644 redhat/extras/trinity-cmake-macros/macros.cmake
 delete mode 100644 redhat/macros.cmake

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index a3c2bb5d0..de4338805 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -247,6 +247,11 @@ endif
 akode:	tqtinterface
 	$(call buildpkg,extras/akode)
 
+cmake-macros: cmake
+ifneq ($(wildcard /etc/SuSE-release),)
+	$(call buildpkg,extras/trinity-cmake-macros)
+endif
+
 ### Trinity Libraries
 kipi-plugins:	tqtinterface libkipi
 	$(call buildpkg,libraries/kipi-plugins)
diff --git a/redhat/extras/trinity-cmake-macros/macros.cmake b/redhat/extras/trinity-cmake-macros/macros.cmake
new file mode 100644
index 000000000..cdcb7a1e1
--- /dev/null
+++ b/redhat/extras/trinity-cmake-macros/macros.cmake
@@ -0,0 +1,34 @@
+#
+# Macros for cmake
+#
+%_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
+%_cmake_version 2.8.11
+%__cmake /usr/bin/cmake
+
+# - Set default compile flags
+# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
+# and default to -O3 -DNDEBUG.  Strip the -O3 so we can override with *FLAGS
+# - Turn on verbose makefiles so we can see and verify compile flags
+# - Set default install prefixes and library install directories
+# - Turn on shared libraries by default
+%cmake \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
+  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
+  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
+  %__cmake \\\
+        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
+        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
+        -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
+        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+        -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
diff --git a/redhat/macros.cmake b/redhat/macros.cmake
deleted file mode 100644
index cdcb7a1e1..000000000
--- a/redhat/macros.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Macros for cmake
-#
-%_cmake_lib_suffix64 -DLIB_SUFFIX=64
-%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
-%_cmake_version 2.8.11
-%__cmake /usr/bin/cmake
-
-# - Set default compile flags
-# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
-# and default to -O3 -DNDEBUG.  Strip the -O3 so we can override with *FLAGS
-# - Turn on verbose makefiles so we can see and verify compile flags
-# - Set default install prefixes and library install directories
-# - Turn on shared libraries by default
-%cmake \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
-  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
-  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %__cmake \\\
-        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-        -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-        -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
-- 
cgit v1.2.1