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

16
fairmq/CMakeLists.txt
View File

@ -87,7 +87,6 @@ set(FAIRMQ_PRIVATE_HEADER_FILES
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
@ -148,7 +147,6 @@ set(FAIRMQ_SOURCE_FILES
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
@ -239,6 +237,7 @@ target_link_libraries(${_target}
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
rt
Boost::boost Boost::boost
Boost::program_options Boost::program_options
Boost::thread Boost::thread
@ -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)