From 4b25a4e4c6cc67c492f273bc152ab3926cdeac57 Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Tue, 16 Aug 2016 09:12:14 +0200
Subject: [PATCH] cmake rules now simply look for zeromq as opposed to zeromq3
---
cmake/{Findzeromq3.cmake => Findzeromq.cmake} | 10 +++++-----
tapeserver/castor/messages/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
rename cmake/{Findzeromq3.cmake => Findzeromq.cmake} (84%)
diff --git a/cmake/Findzeromq3.cmake b/cmake/Findzeromq.cmake
similarity index 84%
rename from cmake/Findzeromq3.cmake
rename to cmake/Findzeromq.cmake
index f8dfa56d13..2798a9e481 100644
--- a/cmake/Findzeromq3.cmake
+++ b/cmake/Findzeromq.cmake
@@ -15,14 +15,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This module will set the following variables:
-# ZEROMQ3_FOUND
-# ZEROMQ3_INCLUDE_DIRS
+# ZEROMQ_FOUND
+# ZEROMQ_INCLUDE_DIRS
-find_path (ZEROMQ3_INCLUDE_DIRS
+find_path (ZEROMQ_INCLUDE_DIRS
zmq.h
PATHS /usr/include
NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(zeromq3 DEFAULT_MSG
- ZEROMQ3_INCLUDE_DIRS)
+find_package_handle_standard_args(zeromq DEFAULT_MSG
+ ZEROMQ_INCLUDE_DIRS)
diff --git a/tapeserver/castor/messages/CMakeLists.txt b/tapeserver/castor/messages/CMakeLists.txt
index 28a997cc59..4bae55a2e2 100644
--- a/tapeserver/castor/messages/CMakeLists.txt
+++ b/tapeserver/castor/messages/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(${PROJECT_BINARY_DIR}/tapeserver)
find_package(openssl REQUIRED)
find_package(Protobuf REQUIRED)
-find_package(zeromq3 REQUIRED)
+find_package(zeromq REQUIRED)
file(GLOB ProtoFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.proto")
PROTOBUF_GENERATE_CPP(ProtoSources ProtoHeaders ${ProtoFiles})
--
GitLab