build!: Create a single library again

BREAKING CHANGE: Removes exported targets FairMQ::Tools and
FairMQ::StateMachine. However, it is unlikely those were used
by anyone.

fairmq/CMakeLists.txt

@@ -23,142 +23,14 @@ if(BUILD_FAIRMQ)
     DESTINATION ${PROJECT_INSTALL_INCDIR}
   )
 
-  #########
-  # Tools #
-  #########
-  set(target Tools)
-
-  set(TOOLS_PUBLIC_HEADER_FILES
-    tools/CppSTL.h
-    tools/Exceptions.h
-    tools/InstanceLimit.h
-    tools/IO.h
-    tools/Network.h
-    tools/Process.h
-    tools/RateLimit.h
-    tools/Semaphore.h
-    tools/Strings.h
-    tools/Unique.h
-    tools/Version.h
-    Error.h
-    Tools.h
-  )
-
-  set(TOOLS_SOURCE_FILES
-    Error.cxx
-    tools/Network.cxx
-    tools/Process.cxx
-    tools/Semaphore.cxx
-    tools/Unique.cxx
-  )
-
-  add_library(${target}
-    ${TOOLS_SOURCE_FILES}
-    ${TOOLS_PUBLIC_HEADER_FILES}
-  )
-  target_compile_features(${target} PUBLIC cxx_std_17)
-  target_compile_definitions(${target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY)
-  target_include_directories(${target}
-    PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  )
-  target_link_libraries(${target}
-    PRIVATE
-    FairLogger::FairLogger
-    Threads::Threads
-    Boost::boost
-  )
-  set_target_properties(${target} PROPERTIES
-    VERSION ${PROJECT_VERSION}
-    SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
-    OUTPUT_NAME FairMQ${target}
-  )
-  if(BUILD_TIDY_TOOL AND RUN_FAIRMQ_TIDY)
-    fairmq_target_tidy(TARGET ${target})
-  endif()
-  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
-    States.h
-    StateQueue.h
-  )
-
-  set(FSM_SOURCE_FILES
-    StateMachine.cxx
-    States.cxx
-  )
-
-  add_library(${target}
-    ${FSM_SOURCE_FILES}
-    ${FSM_PUBLIC_HEADER_FILES}
-  )
-  target_compile_features(${target} PUBLIC cxx_std_17)
-  target_compile_definitions(${target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY)
-  target_include_directories(${target}
-    PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  )
-  target_link_libraries(${target}
-    PUBLIC
-    FairLogger::FairLogger
-
-    PRIVATE
-    Boost::boost
-    Tools
-  )
-  set_target_properties(${target} PROPERTIES
-    VERSION ${PROJECT_VERSION}
-    SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
-    OUTPUT_NAME FairMQ${target}
-  )
-  if(BUILD_TIDY_TOOL AND RUN_FAIRMQ_TIDY)
-    fairmq_target_tidy(TARGET ${target})
-  endif()
-  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 #
   ##########################
   set(FAIRMQ_PUBLIC_HEADER_FILES
     Channel.h
     Device.h
     DeviceRunner.h
+    Error.h
     EventManager.h
     FairMQChannel.h
     FairMQDevice.h
@@ -184,17 +56,32 @@ if(BUILD_FAIRMQ)
     Properties.h
     PropertyOutput.h
     Socket.h
+    StateMachine.h
+    States.h
+    StateQueue.h
     SuboptParser.h
+    Tools.h
     TransportFactory.h
     Transports.h
     UnmanagedRegion.h
     options/FairMQProgOptions.h
     runDevice.h
     runFairMQDevice.h
-    shmem/Monitor.h
     shmem/Common.h
-    shmem/UnmanagedRegion.h
+    shmem/Monitor.h
     shmem/Segment.h
+    shmem/UnmanagedRegion.h
+    tools/CppSTL.h
+    tools/Exceptions.h
+    tools/IO.h
+    tools/InstanceLimit.h
+    tools/Network.h
+    tools/Process.h
+    tools/RateLimit.h
+    tools/Semaphore.h
+    tools/Strings.h
+    tools/Unique.h
+    tools/Version.h
   )
 
   set(FAIRMQ_PRIVATE_HEADER_FILES
@@ -239,20 +126,27 @@ if(BUILD_FAIRMQ)
     Channel.cxx
     Device.cxx
     DeviceRunner.cxx
+    Error.cxx
     JSONParser.cxx
     MemoryResources.cxx
     Plugin.cxx
     PluginManager.cxx
     PluginServices.cxx
     ProgOptions.cxx
     Properties.cxx
+    StateMachine.cxx
+    States.cxx
     SuboptParser.cxx
     TransportFactory.cxx
     plugins/config/Config.cxx
     plugins/control/Control.cxx
     shmem/Common.cxx
     shmem/Manager.cxx
     shmem/Monitor.cxx
+    tools/Network.cxx
+    tools/Process.cxx
+    tools/Semaphore.cxx
+    tools/Unique.cxx
   )
 
   if(BUILD_OFI_TRANSPORT)
@@ -331,8 +225,6 @@ if(BUILD_FAIRMQ)
     Boost::filesystem
     Boost::regex
     FairLogger::FairLogger
-    Tools
-    StateMachine
 
     PRIVATE # only libFairMQ links against private dependencies
     libzmq
@@ -414,7 +306,7 @@ if(BUILD_FAIRMQ)
   add_executable(fairmq-uuid-gen tools/runUuidGenerator.cxx)
   target_link_libraries(fairmq-uuid-gen PUBLIC
     Boost::program_options
-    Tools
+    FairMQ
   )
   if(BUILD_TIDY_TOOL AND RUN_FAIRMQ_TIDY)
     fairmq_target_tidy(TARGET fairmq-uuid-gen)

fairmq/plugins/PMIx/CMakeLists.txt

@@ -24,7 +24,7 @@ set_target_properties(${plugin} PROPERTIES
 
 set(exe fairmq-pmix-command-ui)
 add_executable(${exe} ${CMAKE_CURRENT_SOURCE_DIR}/runPMIxCommandUI.cxx)
-target_link_libraries(${exe} FairMQ StateMachine PMIx::libpmix)
+target_link_libraries(${exe} FairMQ PMIx::libpmix)
 target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 install(TARGETS ${plugin} ${exe}