Cmake should look for zmq.h, not zmq.hpp

This commit is contained in:
Petr Machata 2015-01-28 16:54:12 +01:00
parent 0e1329f645
commit 1ef15ee062
2 changed files with 17 additions and 0 deletions

View File

@ -11,6 +11,7 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://sourceforge.net/projects/%{name}/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: stdair-1.00.1-cmake.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: cmake, python-devel
@ -56,6 +57,7 @@ online (http://%{name}.org).
%prep
%setup -q
%patch0 -p1
%build
@ -113,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.00.0-11
- Rebuild for boost 1.57.0
- Cmake should look for zmq.h, not zmq.hpp (stdair-1.00.1-cmake.patch)
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

14
stdair-1.00.1-cmake.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up stdair-1.00.1/config/FindZeroMQ.cmake\~ stdair-1.00.1/config/FindZeroMQ.cmake
--- stdair-1.00.1/config/FindZeroMQ.cmake~ 2012-12-22 11:44:25.000000000 +0100
+++ stdair-1.00.1/config/FindZeroMQ.cmake 2015-01-28 10:12:48.786823055 +0100
@@ -25,7 +25,7 @@ find_library (ZeroMQ_LIBRARIES
HINTS ${ZeroMQ_ROOT_DIR}/lib)
find_path (ZeroMQ_INCLUDE_DIR
- NAMES zmq.hpp
+ NAMES zmq.h
HINTS ${ZeroMQ_ROOT_DIR}/include)
#
Diff finished. Wed Jan 28 10:13:03 2015