diff --git a/CMakeLists.txt b/CMakeLists.txt index 82409ec8..fd99f6a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,8 @@ if(BUILD_FAIRMQ) endif() if(BUILD_NANOMSG_TRANSPORT) - find_package2(PRIVATE nanomsg VERSION 1.0.0 REQUIRED) + find_package2(PRIVATE nanomsg REQUIRED) + set(PROJECT_nanomsg_VERSION 1.1.3) # Once upstream releases 1.1.5, we should bump again and use version check find_package2(PRIVATE msgpack VERSION 3.0.0) set(PROJECT_msgpack_VERSION 2.1.5) if(NOT msgpack_FOUND) @@ -165,11 +166,6 @@ if(BUILD_DDS_PLUGIN) DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} ) endif() -if(BUILD_NANOMSG_TRANSPORT) - install(FILES cmake/Findnanomsg.cmake - DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} - ) -endif() if(BUILD_OFI_TRANSPORT) install(FILES cmake/FindOFI.cmake DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} diff --git a/cmake/Findnanomsg.cmake b/cmake/Findnanomsg.cmake deleted file mode 100644 index 51415880..00000000 --- a/cmake/Findnanomsg.cmake +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH # -# # -# This software is distributed under the terms of the # -# GNU Lesser General Public Licence (LGPL) version 3, # -# copied verbatim in the file "LICENSE" # -################################################################################ - -find_path(nanomsg_INCLUDE_DIR - NAMES nanomsg/nn.h - HINTS ${NANOMSG_ROOT} $ENV{NANOMSG_ROOT} - PATH_SUFFIXES include - DOC "Path to nanomsg include header files." -) - -find_library(nanomsg_LIBRARY_SHARED - NAMES libnanomsg.dylib libnanomsg.so - HINTS ${NANOMSG_ROOT} $ENV{NANOMSG_ROOT} - PATH_SUFFIXES lib - DOC "Path to libnanomsg.dylib libnanomsg.so." -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(nanomsg - REQUIRED_VARS nanomsg_LIBRARY_SHARED nanomsg_INCLUDE_DIR -) - -if(NOT TARGET nanomsg AND nanomsg_FOUND) - add_library(nanomsg SHARED IMPORTED) - set_target_properties(nanomsg PROPERTIES - IMPORTED_LOCATION ${nanomsg_LIBRARY_SHARED} - INTERFACE_INCLUDE_DIRECTORIES ${nanomsg_INCLUDE_DIR} - ) -endif()