Split StateMachine and Tools into separate targets

This change is needed to share the functionality between
the core library and the SDK library. We want to support building/installing
just the SDK without having a dependency on the core library which adds
additional dependencies.

CMakeLists.txt

@@ -139,12 +139,7 @@ endif()
 
 
 # Targets ######################################################################
-if(BUILD_FAIRMQ)
+if(BUILD_FAIRMQ OR BUILD_SDK)
-  configure_file(${PROJECT_NAME_LOWER}/Version.h.in
-    ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
-    @ONLY
-  )
-
   add_subdirectory(fairmq)
 endif()
 
@@ -165,10 +160,6 @@ if(BUILD_DOCS)
   doxygen_add_docs(doxygen README.md fairmq)
   add_custom_target(docs ALL DEPENDS doxygen)
 endif()
-
-if(BUILD_SDK)
-  add_subdirectory(fairmq/sdk)
-endif()
 ################################################################################
 
 
@@ -205,10 +196,6 @@ endif()
 
 # Installation #################################################################
 if(BUILD_FAIRMQ)
-  install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
-    DESTINATION ${PROJECT_INSTALL_INCDIR}
-  )
-
   install(FILES cmake/FindZeroMQ.cmake
     DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
   )

FairMQTest.cmake

@@ -29,6 +29,7 @@ Set(configure_options "${configure_options};-DCMAKE_PREFIX_PATH=$ENV{SIMPATH}")
 Set(configure_options "${configure_options};-DBUILD_NANOMSG_TRANSPORT=ON")
 # Set(configure_options "${configure_options};-DBUILD_OFI_TRANSPORT=ON")
 Set(configure_options "${configure_options};-DBUILD_DDS_PLUGIN=ON")
+Set(configure_options "${configure_options};-DBUILD_SDK=ON")
 Set(configure_options "${configure_options};-DFAST_BUILD=ON")
 Set(configure_options "${configure_options};-DCOTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES=-j$ENV{number_of_processors}")
 

fairmq/CMakeLists.txt

@@ -16,7 +16,128 @@ if(BUILD_PMIX_PLUGIN)
   add_subdirectory(plugins/PMIx)
 endif()
 
+if(BUILD_FAIRMQ OR BUILD_SDK)
+  ###########
+  # Version #
+  ###########
+  configure_file(Version.h.in
+    ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+    @ONLY
+  )
+  install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+    DESTINATION ${PROJECT_INSTALL_INCDIR}
+  )
   
+
+  #########
+  # Tools #
+  #########
+  set(target Tools)
+
+  set(TOOLS_PUBLIC_HEADER_FILES
+    tools/CppSTL.h
+    tools/Network.h
+    tools/Process.h
+    tools/RateLimit.h
+    tools/Strings.h
+    tools/Unique.h
+    tools/Version.h
+    Tools.h
+  )
+
+  set(TOOLS_SOURCE_FILES
+    tools/Network.cxx
+    tools/Process.cxx
+    tools/Unique.cxx
+  )
+
+  add_library(${target}
+    ${TOOLS_SOURCE_FILES}
+    ${TOOLS_PUBLIC_HEADER_FILES}
+  )
+  target_compile_definitions(${target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY)
+  target_include_directories(${target}
+    PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+  )
+  target_link_libraries(${target}
+    PRIVATE
+    FairLogger::FairLogger
+  )
+  set_target_properties(${target} PROPERTIES
+    VERSION ${PROJECT_GIT_VERSION}
+    SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+    OUTPUT_NAME FairMQ${target}
+  )
+  install(
+    TARGETS ${target} 
+    EXPORT ${PROJECT_EXPORT_SET}
+    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${PROJECT_INSTALL_LIBDIR}
+  )
+  foreach(HEADER ${TOOLS_PUBLIC_HEADER_FILES})
+    get_filename_component(_path ${HEADER} DIRECTORY)
+    file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
+    install(FILES ${HEADER}
+      DESTINATION ${_destination}
+    )
+  endforeach()
+
+  #################
+  # State Machine #
+  #################
+  set(target StateMachine)
+
+  set(FSM_PUBLIC_HEADER_FILES
+    StateMachine.h
+  )
+
+  set(FSM_SOURCE_FILES
+    StateMachine.cxx
+  )
+
+  add_library(${target}
+    ${FSM_SOURCE_FILES}
+    ${FSM_PUBLIC_HEADER_FILES}
+  )
+  target_compile_definitions(${target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY)
+  target_include_directories(${target}
+    PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+  )
+  target_link_libraries(${target}
+    PUBLIC
+    FairLogger::FairLogger
+    
+    PRIVATE
+    Boost::boost
+    Tools
+  )
+  set_target_properties(${target} PROPERTIES
+    VERSION ${PROJECT_GIT_VERSION}
+    SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+    OUTPUT_NAME FairMQ${target}
+  )
+  install(
+    TARGETS ${target} 
+    EXPORT ${PROJECT_EXPORT_SET}
+    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${PROJECT_INSTALL_LIBDIR}
+  )
+  foreach(HEADER ${FSM_PUBLIC_HEADER_FILES})
+    get_filename_component(_path ${HEADER} DIRECTORY)
+    file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
+    install(FILES ${HEADER}
+      DESTINATION ${_destination}
+    )
+  endforeach()
+endif()
+
+if(BUILD_FAIRMQ)
   ##########################
   # libFairMQ header files #
   ##########################
@@ -31,11 +152,9 @@ set(FAIRMQ_PUBLIC_HEADER_FILES
     FairMQPoller.h
     FairMQUnmanagedRegion.h
     FairMQSocket.h
-  StateMachine.h
     FairMQTransportFactory.h
     MemoryResources.h
     MemoryResourceTools.h
-  Tools.h
     Transports.h
     options/FairMQProgOptions.h
     options/FairProgOptions.h
@@ -43,13 +162,6 @@ set(FAIRMQ_PUBLIC_HEADER_FILES
     PluginManager.h
     PluginServices.h
     runFairMQDevice.h
-  tools/CppSTL.h
-  tools/Network.h
-  tools/Process.h
-  tools/RateLimit.h
-  tools/Strings.h
-  tools/Unique.h
-  tools/Version.h
   )
 
   set(FAIRMQ_PRIVATE_HEADER_FILES
@@ -110,7 +222,6 @@ set(FAIRMQ_SOURCE_FILES
     FairMQMessage.cxx
     FairMQPoller.cxx
     FairMQSocket.cxx
-  StateMachine.cxx
     FairMQTransportFactory.cxx
     devices/FairMQBenchmarkSampler.cxx
     devices/FairMQMerger.cxx
@@ -131,9 +242,6 @@ set(FAIRMQ_SOURCE_FILES
     shmem/FairMQTransportFactorySHM.cxx
     shmem/Manager.cxx
     shmem/Region.cxx
-  tools/Network.cxx
-  tools/Process.cxx
-  tools/Unique.cxx
     zeromq/FairMQMessageZMQ.cxx
     zeromq/FairMQPollerZMQ.cxx
     zeromq/FairMQUnmanagedRegionZMQ.cxx
@@ -244,6 +352,8 @@ target_link_libraries(${_target}
     Boost::filesystem
     Boost::regex
     FairLogger::FairLogger
+    Tools
+    StateMachine
 
     PRIVATE # only libFairMQ links against private dependencies
     libzmq
@@ -340,3 +450,8 @@ foreach(HEADER ${FAIRMQ_PUBLIC_HEADER_FILES})
       DESTINATION ${_destination}
     )
   endforeach()
+endif()
+
+if(BUILD_SDK)
+  add_subdirectory(sdk)
+endif()

fairmq/StateMachine.h

@@ -9,7 +9,7 @@
 #ifndef FAIRMQSTATEMACHINE_H_
 #define FAIRMQSTATEMACHINE_H_
 
-#include "FairMQLogger.h"
+#include <fairlogger/Logger.h>
 
 #include <string>
 #include <memory>

fairmq/sdk/CMakeLists.txt

@@ -9,7 +9,7 @@
 ################
 # libFairMQSDK #
 ################
-set(target FairMQ_SDK)
+set(target SDK)
 
 set(SDK_PUBLIC_HEADER_FILES
   Session.h
@@ -39,14 +39,17 @@ target_include_directories(${target}
 target_link_libraries(${target}
   PUBLIC
   FairLogger::FairLogger
+  StateMachine
 
   PRIVATE
+  Tools
   DDS::dds_intercom_lib
   DDS::dds_protocol_lib
 )
 set_target_properties(${target} PROPERTIES
   VERSION ${PROJECT_GIT_VERSION}
   SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+  OUTPUT_NAME FairMQ_${target}
 )
 
 ###############
@@ -55,13 +58,13 @@ set_target_properties(${target} PROPERTIES
 add_executable(fairmq runFairMQ.cxx)
 target_link_libraries(fairmq
   PRIVATE
-  FairMQ_SDK
+  SDK
   Boost::program_options
 )
 
 install(
   TARGETS
-  FairMQ_SDK
+  SDK
   fairmq
 
   EXPORT ${PROJECT_EXPORT_SET}
@@ -71,9 +74,9 @@ install(
 )
 
 # preserve relative path and prepend fairmq
-foreach(HEADER ${SDK_PUBLIC_HEADER_FILES})
+foreach(HEADER IN LISTS SDK_PUBLIC_HEADER_FILES)
   get_filename_component(_path ${HEADER} DIRECTORY)
-  file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
+  file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/sdk/${_path} _destination)
   install(FILES ${HEADER}
     DESTINATION ${_destination}
   )

fairmq/sdk/runFairMQ.cxx

@@ -7,9 +7,12 @@
  ********************************************************************************/
 
 #include <fairmq/sdk/Topology.h>
+#include <fairmq/StateMachine.h>
+#include <iostream>
 
-int main(int argc, char *argv[])
+int main(int /*argc*/, char ** /*argv*/)
 {
+  std::cout << fair::mq::State::Idle << std::endl;
    
   return 0;
 }

fairmq/tools/Network.cxx

@@ -12,7 +12,7 @@
 #define _GNU_SOURCE // To get defns of NI_MAXSERV and NI_MAXHOST
 #endif
 
-#include "FairMQLogger.h"
+#include <fairlogger/Logger.h>
 
 #include <sys/socket.h>
 #include <sys/types.h>