Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ODR violation

Browse Source 
fairmq/shmem/Monitor.cxx:39:27: error: redefinition of ‘volatile sig_atomic_t {anonymous}::gSignalStatus’
     volatile sig_atomic_t gSignalStatus = 0;
                           ^~~~~~~~~~~~~
In file included from fairmq/cotire/FairMQ__CXX_unity_20_29.cxx:4:
fairmq/plugins/Control.cxx:20:27: note: ‘volatile sig_atomic_t {anonymous}::gSignalStatus’ previously defined here
     volatile sig_atomic_t gSignalStatus = 0;
                           ^~~~~~~~~~~~~
This commit is contained in:
Dennis Klein 2018-09-19 16:41:42 +02:00 committed by Dennis Klein
parent c2bea85b90
commit adfa0e2c95
1 changed files with 168 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
fairmq/CMakeLists.txt
View File

@ -38,146 +38,144 @@ endif()
# libFairMQ header files # # libFairMQ header files #
########################## ##########################
set(FAIRMQ_PUBLIC_HEADER_FILES set(FAIRMQ_PUBLIC_HEADER_FILES
DeviceRunner.h DeviceRunner.h
EventManager.h EventManager.h
FairMQChannel.h FairMQChannel.h
FairMQDevice.h FairMQDevice.h
FairMQLogger.h FairMQLogger.h
FairMQMessage.h FairMQMessage.h
FairMQParts.h FairMQParts.h
FairMQPoller.h FairMQPoller.h
FairMQUnmanagedRegion.h FairMQUnmanagedRegion.h
FairMQSocket.h FairMQSocket.h
FairMQStateMachine.h FairMQStateMachine.h
FairMQTransportFactory.h FairMQTransportFactory.h
Tools.h Tools.h
Transports.h Transports.h
options/FairMQProgOptions.h options/FairMQProgOptions.h
options/FairProgOptions.h options/FairProgOptions.h
Plugin.h Plugin.h
PluginManager.h PluginManager.h
PluginServices.h PluginServices.h
runFairMQDevice.h runFairMQDevice.h
tools/CppSTL.h tools/CppSTL.h
tools/Network.h tools/Network.h
tools/Process.h tools/Process.h
tools/RateLimit.h tools/RateLimit.h
tools/Strings.h tools/Strings.h
tools/Unique.h tools/Unique.h
tools/Version.h tools/Version.h
) )
set(FAIRMQ_PRIVATE_HEADER_FILES set(FAIRMQ_PRIVATE_HEADER_FILES
devices/FairMQBenchmarkSampler.h devices/FairMQBenchmarkSampler.h
devices/FairMQMerger.h devices/FairMQMerger.h
devices/FairMQMultiplier.h devices/FairMQMultiplier.h
devices/FairMQProxy.h devices/FairMQProxy.h
devices/FairMQSink.h devices/FairMQSink.h
devices/FairMQSplitter.h devices/FairMQSplitter.h
options/FairMQParser.h options/FairMQParser.h
options/FairMQSuboptParser.h options/FairMQSuboptParser.h
options/FairProgOptionsHelper.h options/FairProgOptionsHelper.h
plugins/Builtin.h plugins/Builtin.h
plugins/Control.h plugins/Control.h
StateMachine.h StateMachine.h
shmem/FairMQMessageSHM.h shmem/FairMQMessageSHM.h
shmem/FairMQPollerSHM.h shmem/FairMQPollerSHM.h
shmem/FairMQUnmanagedRegionSHM.h shmem/FairMQUnmanagedRegionSHM.h
shmem/FairMQSocketSHM.h shmem/FairMQSocketSHM.h
shmem/FairMQTransportFactorySHM.h shmem/FairMQTransportFactorySHM.h
shmem/Common.h shmem/Common.h
shmem/Manager.h shmem/Manager.h
shmem/Monitor.h shmem/Region.h
shmem/Region.h zeromq/FairMQMessageZMQ.h
zeromq/FairMQMessageZMQ.h zeromq/FairMQPollerZMQ.h
zeromq/FairMQPollerZMQ.h zeromq/FairMQUnmanagedRegionZMQ.h
zeromq/FairMQUnmanagedRegionZMQ.h zeromq/FairMQSocketZMQ.h
zeromq/FairMQSocketZMQ.h zeromq/FairMQTransportFactoryZMQ.h
zeromq/FairMQTransportFactoryZMQ.h
) )
if(BUILD_NANOMSG_TRANSPORT) if(BUILD_NANOMSG_TRANSPORT)
set(FAIRMQ_PRIVATE_HEADER_FILES ${FAIRMQ_PRIVATE_HEADER_FILES} set(FAIRMQ_PRIVATE_HEADER_FILES ${FAIRMQ_PRIVATE_HEADER_FILES}
nanomsg/FairMQMessageNN.h nanomsg/FairMQMessageNN.h
nanomsg/FairMQPollerNN.h nanomsg/FairMQPollerNN.h
nanomsg/FairMQUnmanagedRegionNN.h nanomsg/FairMQUnmanagedRegionNN.h
nanomsg/FairMQSocketNN.h nanomsg/FairMQSocketNN.h
nanomsg/FairMQTransportFactoryNN.h nanomsg/FairMQTransportFactoryNN.h
) )
endif() endif()
if(BUILD_OFI_TRANSPORT) if(BUILD_OFI_TRANSPORT)
set(FAIRMQ_PRIVATE_HEADER_FILES ${FAIRMQ_PRIVATE_HEADER_FILES} set(FAIRMQ_PRIVATE_HEADER_FILES ${FAIRMQ_PRIVATE_HEADER_FILES}
ofi/Context.h ofi/Context.h
ofi/Message.h ofi/Message.h
ofi/Poller.h ofi/Poller.h
ofi/Socket.h ofi/Socket.h
ofi/TransportFactory.h ofi/TransportFactory.h
) )
endif() endif()
########################## ##########################
# libFairMQ source files # # libFairMQ source files #
########################## ##########################
set(FAIRMQ_SOURCE_FILES set(FAIRMQ_SOURCE_FILES
DeviceRunner.cxx DeviceRunner.cxx
FairMQChannel.cxx FairMQChannel.cxx
FairMQDevice.cxx FairMQDevice.cxx
FairMQLogger.cxx FairMQLogger.cxx
FairMQMessage.cxx FairMQMessage.cxx
FairMQPoller.cxx FairMQPoller.cxx
FairMQSocket.cxx FairMQSocket.cxx
FairMQStateMachine.cxx FairMQStateMachine.cxx
FairMQTransportFactory.cxx FairMQTransportFactory.cxx
devices/FairMQBenchmarkSampler.cxx devices/FairMQBenchmarkSampler.cxx
devices/FairMQMerger.cxx devices/FairMQMerger.cxx
devices/FairMQMultiplier.cxx devices/FairMQMultiplier.cxx
devices/FairMQProxy.cxx devices/FairMQProxy.cxx
devices/FairMQSplitter.cxx devices/FairMQSplitter.cxx
options/FairMQParser.cxx options/FairMQParser.cxx
options/FairMQProgOptions.cxx options/FairMQProgOptions.cxx
options/FairMQSuboptParser.cxx options/FairMQSuboptParser.cxx
Plugin.cxx Plugin.cxx
PluginManager.cxx PluginManager.cxx
PluginServices.cxx PluginServices.cxx
plugins/Control.cxx plugins/Control.cxx
StateMachine.cxx StateMachine.cxx
shmem/FairMQMessageSHM.cxx shmem/FairMQMessageSHM.cxx
shmem/FairMQPollerSHM.cxx shmem/FairMQPollerSHM.cxx
shmem/FairMQUnmanagedRegionSHM.cxx shmem/FairMQUnmanagedRegionSHM.cxx
shmem/FairMQSocketSHM.cxx shmem/FairMQSocketSHM.cxx
shmem/FairMQTransportFactorySHM.cxx shmem/FairMQTransportFactorySHM.cxx
shmem/Manager.cxx shmem/Manager.cxx
shmem/Monitor.cxx shmem/Region.cxx
shmem/Region.cxx tools/Network.cxx
tools/Network.cxx tools/Process.cxx
tools/Process.cxx tools/Unique.cxx
tools/Unique.cxx zeromq/FairMQMessageZMQ.cxx
zeromq/FairMQMessageZMQ.cxx zeromq/FairMQPollerZMQ.cxx
zeromq/FairMQPollerZMQ.cxx zeromq/FairMQUnmanagedRegionZMQ.cxx
zeromq/FairMQUnmanagedRegionZMQ.cxx zeromq/FairMQSocketZMQ.cxx
zeromq/FairMQSocketZMQ.cxx zeromq/FairMQTransportFactoryZMQ.cxx
zeromq/FairMQTransportFactoryZMQ.cxx
) )
if(BUILD_NANOMSG_TRANSPORT) if(BUILD_NANOMSG_TRANSPORT)
set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES} set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES}
nanomsg/FairMQMessageNN.cxx nanomsg/FairMQMessageNN.cxx
nanomsg/FairMQPollerNN.cxx nanomsg/FairMQPollerNN.cxx
nanomsg/FairMQUnmanagedRegionNN.cxx nanomsg/FairMQUnmanagedRegionNN.cxx
nanomsg/FairMQSocketNN.cxx nanomsg/FairMQSocketNN.cxx
nanomsg/FairMQTransportFactoryNN.cxx nanomsg/FairMQTransportFactoryNN.cxx
) )
endif() endif()
if(BUILD_OFI_TRANSPORT) if(BUILD_OFI_TRANSPORT)
set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES} set(FAIRMQ_SOURCE_FILES ${FAIRMQ_SOURCE_FILES}
ofi/Context.cxx ofi/Context.cxx
ofi/Message.cxx ofi/Message.cxx
ofi/Poller.cxx ofi/Poller.cxx
ofi/Socket.cxx ofi/Socket.cxx
ofi/TransportFactory.cxx ofi/TransportFactory.cxx
) )
endif() endif()
@ -211,12 +209,12 @@ endif()
# include directories # # include directories #
####################### #######################
target_include_directories(${_target} target_include_directories(${_target}
PUBLIC # consumers inherit public include directories PUBLIC # consumers inherit public include directories
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
$<INSTALL_INTERFACE:include/fairmq> $<INSTALL_INTERFACE:include/fairmq>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
################## ##################
@ -234,25 +232,26 @@ if(optional_deps)
endif() endif()
target_link_libraries(${_target} target_link_libraries(${_target}
INTERFACE # only consumers link against interface dependencies INTERFACE # only consumers link against interface dependencies
PUBLIC # libFairMQ AND consumers of libFairMQ link aginst public dependencies PUBLIC # libFairMQ AND consumers of libFairMQ link aginst public dependencies
Threads::Threads Threads::Threads
dl dl
Boost::boost rt
Boost::program_options Boost::boost
Boost::thread Boost::program_options
Boost::system Boost::thread
Boost::filesystem Boost::system
Boost::regex Boost::filesystem
Boost::date_time Boost::regex
Boost::signals Boost::date_time
FairLogger::FairLogger Boost::signals
FairLogger::FairLogger
PRIVATE # only libFairMQ links against private dependencies PRIVATE # only libFairMQ links against private dependencies
libzmq libzmq
${NANOMSG_DEPS} ${NANOMSG_DEPS}
${OFI_DEPS} ${OFI_DEPS}
) )
set_target_properties(${_target} PROPERTIES set_target_properties(${_target} PROPERTIES
VERSION ${PROJECT_GIT_VERSION} VERSION ${PROJECT_GIT_VERSION}
@ -299,8 +298,17 @@ target_link_libraries(fairmq-splitter FairMQ)
add_executable(runConfigExample options/runConfigEx.cxx) add_executable(runConfigExample options/runConfigEx.cxx)
target_link_libraries(runConfigExample FairMQ) target_link_libraries(runConfigExample FairMQ)
add_executable(fairmq-shmmonitor shmem/runMonitor.cxx) add_executable(fairmq-shmmonitor shmem/Monitor.cxx shmem/Monitor.h shmem/runMonitor.cxx)
target_link_libraries(fairmq-shmmonitor FairMQ) target_link_libraries(fairmq-shmmonitor PUBLIC
Threads::Threads
rt
Boost::boost
Boost::date_time
Boost::program_options
)
target_include_directories(fairmq-shmmonitor PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
)
add_executable(fairmq-uuid-gen run/runUuidGenerator.cxx) add_executable(fairmq-uuid-gen run/runUuidGenerator.cxx)
target_link_libraries(fairmq-uuid-gen FairMQ) target_link_libraries(fairmq-uuid-gen FairMQ)
@ -310,27 +318,27 @@ target_link_libraries(fairmq-uuid-gen FairMQ)
# install # # install #
########### ###########
install( install(
TARGETS TARGETS
FairMQ FairMQ
fairmq-bsampler fairmq-bsampler
fairmq-merger fairmq-merger
fairmq-multiplier fairmq-multiplier
fairmq-proxy fairmq-proxy
fairmq-sink fairmq-sink
fairmq-splitter fairmq-splitter
fairmq-shmmonitor fairmq-shmmonitor
fairmq-uuid-gen fairmq-uuid-gen
EXPORT ${PROJECT_EXPORT_SET} EXPORT ${PROJECT_EXPORT_SET}
RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
) )
# preserve relative path and prepend fairmq # preserve relative path and prepend fairmq
foreach(HEADER ${FAIRMQ_PUBLIC_HEADER_FILES}) foreach(HEADER ${FAIRMQ_PUBLIC_HEADER_FILES})
get_filename_component(_path ${HEADER} DIRECTORY) get_filename_component(_path ${HEADER} DIRECTORY)
file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination) file(TO_CMAKE_PATH ${PROJECT_INSTALL_INCDIR}/${_path} _destination)
install(FILES ${HEADER} install(FILES ${HEADER}
DESTINATION ${_destination} DESTINATION ${_destination}
) )
endforeach() endforeach()