detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-24 10:31:09 +02:00
Code Issues Actions Packages Releases Activity

cmake 3.9 and removed zmq

Browse Source
This commit is contained in:
Erik Frojdh
2021-11-11 15:41:50 +01:00
parent 274ec27934
commit 9ca831d954
3 changed files with 307 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
CMakeLists.txt
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: LGPL-3.0-or-other
# Copyright (C) 2021 Contributors to the SLS Detector Package
cmake_minimum_required(VERSION 3.12)
cmake_minimum_required(VERSION 3.9)
project(slsDetectorPackage)
set(PROJECT_VERSION 6.0.0)
@ -172,35 +172,35 @@ set(CMAKE_INSTALL_RPATH $ORIGIN)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
#Adapted from: https://github.com/zeromq/cppzmq/
if (NOT TARGET libzmq)
if(ZeroMQ_HINT)
message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
find_package(ZeroMQ 4
NO_DEFAULT_PATH
HINTS ${ZeroMQ_DIR}
)
else()
find_package(ZeroMQ 4 QUIET)
endif()
# set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
# #Adapted from: https://github.com/zeromq/cppzmq/
# if (NOT TARGET libzmq)
# if(ZeroMQ_HINT)
# message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
# find_package(ZeroMQ 4
# NO_DEFAULT_PATH
# HINTS ${ZeroMQ_DIR}
# )
# else()
# find_package(ZeroMQ 4 QUIET)
# endif()
# libzmq autotools install: fallback to pkg-config
if(NOT ZeroMQ_FOUND)
message(STATUS "CMake libzmq package not found, trying again with pkg-config (normal install of zeromq)")
list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
find_package(ZeroMQ 4 REQUIRED)
endif()
# # libzmq autotools install: fallback to pkg-config
# if(NOT ZeroMQ_FOUND)
# message(STATUS "CMake libzmq package not found, trying again with pkg-config (normal install of zeromq)")
# list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
# find_package(ZeroMQ 4 REQUIRED)
# endif()
# TODO "REQUIRED" above should already cause a fatal failure if not found, but this doesn't seem to work
if(NOT ZeroMQ_FOUND)
message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config")
endif()
# # TODO "REQUIRED" above should already cause a fatal failure if not found, but this doesn't seem to work
# if(NOT ZeroMQ_FOUND)
# message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config")
# endif()
if (ZeroMQ_FOUND AND NOT TARGET libzmq)
message(FATAL_ERROR "ZeroMQ version not supported!")
endif()
endif()
# if (ZeroMQ_FOUND AND NOT TARGET libzmq)
# message(FATAL_ERROR "ZeroMQ version not supported!")
# endif()
# endif()
if (SLS_USE_TESTS)
enable_testing()