From b9651437c3d0df047caf705c84fde2c5c09fd25d Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Mon, 16 Apr 2018 20:32:44 +0200
Subject: [PATCH] Improve summary and implement find_package2

---
 CMakeLists.txt                    | 100 +++++++++++++-----------------
 cmake/FairMQLib.cmake             |  84 +++++++++++++++++++++----
 cmake/FindDDS.cmake               |  14 +++++
 cmake/FindOFI.cmake               |   2 +-
 fairmq/CMakeLists.txt             |  51 ++++-----------
 fairmq/ofi/CMakeLists.txt         |  11 ++++
 fairmq/plugins/DDS/CMakeLists.txt |   6 +-
 7 files changed, 156 insertions(+), 112 deletions(-)
 create mode 100644 fairmq/ofi/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb575ae..57ac8638 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,10 +14,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FairMQLib)
 
 set_fairmq_cmake_policies()
-get_git_version(OUTVAR_PREFIX FairMQ)
+get_git_version()
 
-project(FairMQ VERSION ${FairMQ_VERSION} LANGUAGES CXX)
-message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${${PROJECT_NAME}_GIT_VERSION} from ${${PROJECT_NAME}_DATE}")
+project(FairMQ VERSION ${PROJECT_VERSION} LANGUAGES CXX)
+message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")
 
 set_fairmq_defaults()
 
@@ -33,64 +33,28 @@ option(BUILD_DDS_PLUGIN "Build DDS plugin." OFF)
 
 
 # Dependencies #################################################################
-set(dep Boost)
-set(PROJECT_${dep}_VERSION 1.64)
-set(PROJECT_${dep}_COMPONENTS program_options thread system filesystem regex date_time signals)
-if(Boost_INCLUDE_DIR) # Silence output, if Boost was found already
-  set(SILENCE_BOOST QUIET)
-endif()
-find_package(${dep} ${PROJECT_${dep}_VERSION} ${SILENCE_BOOST} REQUIRED COMPONENTS ${PROJECT_${dep}_COMPONENTS})
-list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
-
-set(dep FairLogger)
-set(PROJECT_${dep}_VERSION 1.0.2)
-string(TOUPPER ${dep} upper_dep)
-set(old ${CMAKE_PREFIX_PATH})
-set(CMAKE_PREFIX_PATH ${${upper_dep}_ROOT} $ENV{${upper_dep}_ROOT} ${CMAKE_PREFIX_PATH})
-find_package(${dep} ${PROJECT_${dep}_VERSION} REQUIRED)
-list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
-set(CMAKE_PREFIX_PATH ${old})
-
-set(dep ZeroMQ)
-set(PROJECT_${dep}_VERSION 4.2.2)
-find_package(${dep} ${PROJECT_${dep}_VERSION} REQUIRED)
-list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
+find_package2(PUBLIC Boost VERSION 1.64 REQUIRED
+  COMPONENTS program_options thread system filesystem regex date_time signals
+)
+find_package2(PUBLIC FairLogger VERSION 1.0.2 REQUIRED)
+find_package2(PRIVATE ZeroMQ VERSION 4.2.2 REQUIRED)
 
 if(BUILD_NANOMSG_TRANSPORT)
-  set(dep nanomsg)
-  find_package(${dep} REQUIRED)
-  list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
-
-  set(dep msgpack)
-  set(PROJECT_${dep}_VERSION 2.1.5)
-  string(TOUPPER ${dep} upper_dep)
-  set(old ${CMAKE_PREFIX_PATH})
-  set(CMAKE_PREFIX_PATH ${${upper_dep}_ROOT} $ENV{${upper_dep}_ROOT} ${CMAKE_PREFIX_PATH})
-  find_package(${dep} ${PROJECT_${dep}_VERSION} REQUIRED)
-  list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
-  set(CMAKE_PREFIX_PATH ${old})
+  find_package2(PRIVATE nanomsg VERSION 1.0.0 REQUIRED)
+  find_package2(PRIVATE msgpack VERSION 2.1.5 REQUIRED)
 endif()
 
 if(BUILD_OFI_TRANSPORT)
-  set(dep OFI)
-  set(PROJECT_${dep}_VERSION 1.6.0)
-  set(PROJECT_${dep}_COMPONENTS fi_sockets)
-  find_package(${dep} ${PROJECT_${dep}_VERSION} REQUIRED COMPONENTS ${PROJECT_${dep}_COMPONENTS})
-  list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
+  find_package2(PRIVATE OFI VERSION 1.6.0 REQUIRED COMPONENTS fi_sockets)
+  find_package2(PRIVATE Protobuf VERSION 3.4.0 REQUIRED)
 endif()
 
 if(BUILD_DDS_PLUGIN)
-  set(dep DDS)
-  set(PROJECT_${dep}_VERSION 2.0)
-  find_package(${dep} ${PROJECT_${dep}_VERSION} REQUIRED)
-  list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
+  find_package2(PRIVATE DDS VERSION 2.0 REQUIRED)
 endif()
 
 if(BUILD_TESTING)
-  set(dep GTest)
-  set(PROJECT_${dep}_VERSION 1.7.0)
-  find_package(${dep} ${PROJECT_${dep}_VERSION} REQUIRED)
-  list(APPEND PROJECT_PACKAGE_DEPENDENCIES ${dep})
+  find_package2(PRIVATE GTest VERSION 1.7.0 REQUIRED)
 endif()
 ################################################################################
 
@@ -110,7 +74,7 @@ endif()
 
 
 # Installation #################################################################
-install(FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
   DESTINATION ${PROJECT_INSTALL_INCDIR}
 )
 
@@ -120,31 +84,51 @@ install_cmake_package()
 
 # Summary ######################################################################
 message(STATUS "  ")
+message(STATUS "  ${Cyan}DEPENDENCY      VERSION              PREFIX${CR}")
+foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES)
+  if(${dep}_VERSION)
+    if(${dep} STREQUAL Boost)
+      set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
+    else()
+      set(version_str "${BGreen}${${dep}_VERSION}${CR}")
+    endif()
+  else()
+    set(version_str "${BYellow}unknown${CR}")
+  endif()
+  if(PROJECT_${dep}_VERSION)
+    set(version_req_str " (>= ${PROJECT_${dep}_VERSION})")
+  endif()
+  pad(${dep} 15 " " dep_padded)
+  pad("${version_str}${version_req_str}" 20 " " version_padded)
+  message(STATUS "  ${BWhite}${dep_padded}${CR}${version_padded}...")
+  unset(version_str)
+endforeach()
+message(STATUS "  ")
 message(STATUS "  ${Cyan}COMPONENT         BUILT?  INFO${CR}")
-message(STATUS "  ${BWhite}library${CR}            ${BGreen}YES${CR}    (default, always built)")
+message(STATUS "  ${BWhite}FairMQ${CR}             ${BGreen}YES${CR}    (default, always built)")
 if(BUILD_TESTING)
   set(tests_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_TESTING=OFF${CR})")
 else()
   set(tests_summary "${BRed} NO${CR}    (enable with ${BMagenta}-DBUILD_TESTING=ON${CR})")
 endif()
-message(STATUS "  ${BWhite}tests${CR}              ${tests_summary}")
+message(STATUS "  ${BWhite}test${CR}               ${tests_summary}")
 if(BUILD_NANOMSG_TRANSPORT)
   set(nn_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_NANOMSG_TRANSPORT=OFF${CR})")
 else()
   set(nn_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_NANOMSG_TRANSPORT=ON${CR})")
 endif()
-message(STATUS "  ${BWhite}nanomsg transport${CR}  ${nn_summary}")
+message(STATUS "  ${BWhite}NanomsgTransport${CR}   ${nn_summary}")
 if(BUILD_OFI_TRANSPORT)
-  set(ofi_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})")
+  set(ofi_summary "${BGreen}YES${CR}    EXPERIMENTAL (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})")
 else()
-  set(ofi_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})")
+  set(ofi_summary "${BRed} NO${CR}    EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})")
 endif()
-message(STATUS "  ${BWhite}OFI transport${CR}      ${ofi_summary} Experimental")
+message(STATUS "  ${BWhite}OfiTransport${CR}       ${ofi_summary}")
 if(BUILD_DDS_PLUGIN)
   set(dds_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_DDS_PLUGIN=OFF${CR})")
 else()
   set(dds_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_DDS_PLUGIN=ON${CR})")
 endif()
-message(STATUS "  ${BWhite}DDS plugin${CR}         ${dds_summary}")
+message(STATUS "  ${BWhite}FairMQPlugin_dds${CR}   ${dds_summary}")
 message(STATUS "  ")
 ################################################################################
diff --git a/cmake/FairMQLib.cmake b/cmake/FairMQLib.cmake
index 9fbbba08..201d19e2 100644
--- a/cmake/FairMQLib.cmake
+++ b/cmake/FairMQLib.cmake
@@ -103,6 +103,7 @@ endfunction()
 # Set defaults
 macro(set_fairmq_defaults)
   string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+  string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
 
   # Set a default build type
   if(NOT CMAKE_BUILD_TYPE)
@@ -131,28 +132,53 @@ macro(set_fairmq_defaults)
   set(PROJECT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME_LOWER})
   set(PROJECT_INSTALL_INCDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME_LOWER})
   set(PROJECT_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER})
-  set(PROJECT_INSTALL_CMAKEMODDIR ${${PROJECT_NAME}_INSTALL_DATADIR}/cmake)
+  set(PROJECT_INSTALL_CMAKEMODDIR ${PROJECT_INSTALL_DATADIR}/cmake)
 
   # Define export set, only one for now
   set(PROJECT_EXPORT_SET ${PROJECT_NAME}Targets)
 endmacro()
 
-macro(generate_package_dependencies)
+function(join VALUES GLUE OUTPUT)
+  string(REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
+  string(REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
+  set(${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
+endfunction()
+
+function(pad str width char out)
+  string(LENGTH ${str} length)
+  math(EXPR padding "${width}-${length}")
+  if(padding GREATER 0)
+    foreach(i RANGE ${padding})
+      set(str "${str}${char}")
+    endforeach()
+  endif()
+  set(${out} ${str} PARENT_SCOPE)
+endfunction()
+
+function(generate_package_dependencies)
+  join("${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES}" " " DEPS)
   set(PACKAGE_DEPENDENCIES "\
+####### Expanded from @PACKAGE_DEPENDENCIES@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ############
+
 include(CMakeFindDependencyMacro)
 
-set(${PROJECT_NAME}_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES})
+set(${PROJECT_NAME}_PACKAGE_DEPENDENCIES ${DEPS})
 
 ")
-  foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES)
-    string(CONCAT ${PACKAGE_DEPENDENCIES} "\
-set(${PROJECT_NAME}_${dep}_COMPONENTS ${PROJECT_${dep}_COMPONENTS})
-set(${PROJECT_NAME}_${dep}_VERSION ${PROJECT_${dep}_VERSION})
+  foreach(dep IN LISTS PROJECT_INTERFACE_PACKAGE_DEPENDENCIES)
+    join("${PROJECT_INTERFACE_${dep}_COMPONENTS}" " " COMPS)
+    if(${dep}_FOUND)
+    message(>>>> ${dep} ${${dep}_FOUND})
+  endif()
+    string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\
+set(${PROJECT_NAME}_${dep}_COMPONENTS ${COMPS})
+set(${PROJECT_NAME}_${dep}_VERSION ${PROJECT_INTERFACE_${dep}_VERSION})
 set(${PROJECT_NAME}_${dep}_FOUND ${${dep}_FOUND})
 
 ")
   endforeach()
-  string(CONCAT ${PACKAGE_DEPENDENCIES} "\
+  string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\
 if(Boost_INCLUDE_DIR) # checks for cached boost variable which indicates if Boost is already found
   set(${PROJECT_NAME}_Boost_QUIET QUIET)
 endif()
@@ -172,28 +198,32 @@ foreach(dep IN LISTS ${PROJECT_NAME}_PACKAGE_DEPENDENCIES)
     find_dependency(\${dep} \${${PROJECT_NAME}_\${dep}_VERSION} \${${PROJECT_NAME}_\${dep}_QUIET} \${components})
   endif()
 endforeach()
+
+#######################################################################################
 ")
-endmacro()
+set(PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} PARENT_SCOPE)
+endfunction()
 
 # Configure/Install CMake package
 macro(install_cmake_package)
   # Install cmake modules
   install(DIRECTORY cmake
+    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
     PATTERN "cmake/Find*.cmake"
-    DESTINATION ${${PROJECT_NAME}_INSTALL_CMAKEMODDIR}
   )
 
   include(CMakePackageConfigHelpers)
   set(PACKAGE_INSTALL_DESTINATION
     ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
   )
-  install(EXPORT ${${PROJECT_NAME}_EXPORT_SET}
+  install(EXPORT ${PROJECT_EXPORT_SET}
     NAMESPACE ${PROJECT_NAME}::
     DESTINATION ${PACKAGE_INSTALL_DESTINATION}
     EXPORT_LINK_INTERFACE_LIBRARIES
   )
   write_basic_package_version_file(
     ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
     COMPATIBILITY AnyNewerVersion
   )
   generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
@@ -209,3 +239,35 @@ macro(install_cmake_package)
     DESTINATION ${PACKAGE_INSTALL_DESTINATION}
   )
 endmacro()
+
+function(find_package2 qualifier pkgname)
+  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS" ${ARGN})
+
+  string(TOUPPER ${pkgname} pkgname_upper)
+  set(CMAKE_PREFIX_PATH ${${pkgname_upper}_ROOT} $ENV{${pkgname_upper}_ROOT} ${CMAKE_PREFIX_PATH})
+  if(ARGS_COMPONENTS)
+    find_package(${pkgname} ${ARGS_VERSION} QUIET COMPONENTS ${ARGS_COMPONENTS} ${ARGS_UNPARSED_ARGUMENTS})
+  else()
+    find_package(${pkgname} ${ARGS_VERSION} QUIET ${ARGS_UNPARSED_ARGUMENTS})
+  endif()
+
+  set(${pkgname}_VERSION ${${pkgname}_VERSION} PARENT_SCOPE)
+  set(${pkgname}_MAJOR_VERSION ${${pkgname}_MAJOR_VERSION} PARENT_SCOPE)
+  set(${pkgname}_MINOR_VERSION ${${pkgname}_MINOR_VERSION} PARENT_SCOPE)
+  if(qualifier STREQUAL PRIVATE)
+    set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION} PARENT_SCOPE)
+    set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS} PARENT_SCOPE)
+    set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname} PARENT_SCOPE)
+  elseif(qualifier STREQUAL PUBLIC)
+    set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION} PARENT_SCOPE)
+    set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS} PARENT_SCOPE)
+    set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname} PARENT_SCOPE)
+    set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION} PARENT_SCOPE)
+    set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS} PARENT_SCOPE)
+    set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname} PARENT_SCOPE)
+  elseif(qualifier STREQUAL INTERFACE)
+    set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION} PARENT_SCOPE)
+    set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS} PARENT_SCOPE)
+    set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname} PARENT_SCOPE)
+  endif()
+endfunction()
diff --git a/cmake/FindDDS.cmake b/cmake/FindDDS.cmake
index 899a9a0c..eaaa2e97 100644
--- a/cmake/FindDDS.cmake
+++ b/cmake/FindDDS.cmake
@@ -39,6 +39,18 @@ find_library(DDS_USER_DEFAULTS_LIBRARY_SHARED
   DOC "Path to libdds-user-defaults.dylib libdds-user-defaults.so."
 )
 
+find_file(DDS_VERSION_FILE
+  NAMES version
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES etc
+)
+
+if(DDS_VERSION_FILE AND NOT DDS_VERSION)
+  file(READ ${DDS_VERSION_FILE} DDS_VERSION)
+  string(STRIP "${DDS_VERSION}" DDS_VERSION)
+  set(DDS_VERSION ${DDS_VERSION} CACHE string "DDS version.")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(DDS
   REQUIRED_VARS
@@ -47,6 +59,8 @@ find_package_handle_standard_args(DDS
   DDS_INTERCOM_LIBRARY_SHARED
   DDS_PROTOCOL_LIBRARY_SHARED
   DDS_USER_DEFAULTS_LIBRARY_SHARED
+
+  VERSION_VAR DDS_VERSION
 )
 
 if(NOT TARGET DDS::dds_intercom_lib AND DDS_FOUND)
diff --git a/cmake/FindOFI.cmake b/cmake/FindOFI.cmake
index 40e46e6d..3f0b9074 100644
--- a/cmake/FindOFI.cmake
+++ b/cmake/FindOFI.cmake
@@ -20,7 +20,7 @@ endif()
 
 # This should be the default as of CMake 3.1, but it is not set. BUG? Also, it does not work
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH 1)
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
 
 if(PKG_CONFIG_FOUND)
   # Find include dir and dependencies from pkgconfig
diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt
index 7d65ed6f..1cc6bc36 100644
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -29,15 +29,15 @@ endif()
 # subdirectories #
 ##################
 # add_subdirectory(shmem/prototype)
+if(BUILD_OFI_TRANSPORT)
+  add_subdirectory(ofi)
+endif()
 
 
 ##########################
 # libFairMQ header files #
 ##########################
-set(FAIRMQ_DEPRECATED_HEADER_FILES
-)
 set(FAIRMQ_HEADER_FILES
-    ${FAIRMQ_DEPRECATED_HEADER_FILES}
     DeviceRunner.h
     EventManager.h
     FairMQChannel.h
@@ -185,40 +185,13 @@ configure_file(${CMAKE_SOURCE_DIR}/fairmq/options/startConfigExample.sh.in
                ${CMAKE_BINARY_DIR}/bin/startConfigExample.sh)
 
 
-########################
-# compile protobuffers #
-########################
-if(BUILD_OFI_TRANSPORT)
-    add_custom_target(mkofibuilddir COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/ofi)
-    add_custom_command(
-        OUTPUT
-        ${CMAKE_CURRENT_BINARY_DIR}/ofi/Control.pb.h
-        ${CMAKE_CURRENT_BINARY_DIR}/ofi/Control.pb.cc
-        COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} -I=${CMAKE_CURRENT_SOURCE_DIR}/ofi --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/ofi Control.proto
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS mkofibuilddir ${CMAKE_CURRENT_SOURCE_DIR}/ofi/Control.proto
-    )
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/ofi/Control.pb.h  PROPERTIES GENERATED TRUE)
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/ofi/Control.pb.cc PROPERTIES GENERATED TRUE)
-endif()
-
-
 #################################
 # define libFairMQ build target #
 #################################
-if(BUILD_OFI_TRANSPORT)
-    add_library(FairMQ SHARED
-        ${CMAKE_CURRENT_BINARY_DIR}/ofi/Control.pb.h
-        ${CMAKE_CURRENT_BINARY_DIR}/ofi/Control.pb.cc
-        ${FAIRMQ_SOURCE_FILES}
-        ${FAIRMQ_HEADER_FILES} # for IDE integration
-    )
-else()
-    add_library(FairMQ SHARED
-        ${FAIRMQ_SOURCE_FILES}
-        ${FAIRMQ_HEADER_FILES} # for IDE integration
-    )
-endif()
+add_library(FairMQ SHARED
+  ${FAIRMQ_SOURCE_FILES}
+  ${FAIRMQ_HEADER_FILES} # for IDE integration
+)
 
 #######################
 # include directories #
@@ -239,7 +212,7 @@ if(BUILD_NANOMSG_TRANSPORT)
   set(NANOMSG_DEPS nanomsg msgpackc)
 endif()
 if(BUILD_OFI_TRANSPORT)
-  set(OFI_DEPS OFI::libfabric protobuf::libprotobuf)
+  set(OFI_DEPS OFI::libfabric protobuf::libprotobuf $<TARGET_OBJECTS:OfiTransport>)
 endif()
 target_link_libraries(FairMQ
     INTERFACE # only consumers link against interface dependencies
@@ -310,15 +283,15 @@ install(
     splitter
     shmmonitor
 
-    EXPORT ${FairMQ_EXPORT_SET}
-    LIBRARY DESTINATION ${FairMQ_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${FairMQ_INSTALL_BINDIR}
+    EXPORT ${PROJECT_EXPORT_SET}
+    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
 )
 
 # preserve relative path and prepend fairmq
 foreach(HEADER ${FAIRMQ_HEADER_FILES})
     get_filename_component(_path ${HEADER} DIRECTORY)
-    file(TO_CMAKE_PATH include/fairmq/${_path} _destination)
+    file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
     install(FILES ${HEADER}
         DESTINATION ${_destination}
     )
diff --git a/fairmq/ofi/CMakeLists.txt b/fairmq/ofi/CMakeLists.txt
new file mode 100644
index 00000000..05f75239
--- /dev/null
+++ b/fairmq/ofi/CMakeLists.txt
@@ -0,0 +1,11 @@
+################################################################################
+#    Copyright (C) 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"                       #
+################################################################################
+
+protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS Control.proto)
+
+add_library(OfiTransport OBJECT ${PROTO_SRCS} ${PROTO_HDRS})
diff --git a/fairmq/plugins/DDS/CMakeLists.txt b/fairmq/plugins/DDS/CMakeLists.txt
index ec0bc392..dcdfa9ac 100644
--- a/fairmq/plugins/DDS/CMakeLists.txt
+++ b/fairmq/plugins/DDS/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(${exe} FairMQ DDS::dds_intercom_lib DDS::dds_protocol_lib
 target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 install(TARGETS ${plugin} ${exe}
-    EXPORT ${FairMQ_EXPORT_SET}
-    LIBRARY DESTINATION ${FairMQ_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${FairMQ_INSTALL_BINDIR}
+  EXPORT ${PROJECT_EXPORT_SET}
+  LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
 )