From 0082a5b9e47fb772d75a4fecca094fbf2ca8057e Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <krasznaa@cern.ch> Date: Thu, 23 Jun 2016 10:13:35 +0200 Subject: [PATCH] Fixing the package's linker options with CMake (TileByteStream-00-08-85) 2016-06-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> * Updated CMakeLists.txt to link correctly against the tdaq-common libraries. This is necessary to be able to turn on the -Wl,--no-undefined linker flag in devval. * Removed the executable flag from all of the files of the package. * Removed the empty src/RMS directory. * Tagging as TileByteStream-00-08-85 Former-commit-id: 9490f2a833921075a930649a014724844b521d4a --- .../TileSvc/TileByteStream/CMakeLists.txt | 65 ++++++++++--------- .../TileBeamElemContByteStreamCnv.h | 0 .../TileByteStream/TileCellCont.h | 0 .../TileByteStream/TileDigits2Bytes.h | 0 .../TileDigitsContByteStreamCnv.h | 0 .../TileByteStream/TileHid2RESrcID.h | 0 .../TileByteStream/TileL2ContByteStreamCnv.h | 0 .../TileByteStream/TileL2ContByteStreamTool.h | 0 .../TileMuRcvContByteStreamCnv.h | 0 .../TileMuRcvContByteStreamTool.h | 0 .../TileByteStream/TileROD_Decoder.h | 0 .../TileByteStream/TileROD_Encoder.h | 0 .../TileByteStream/TileRawChannel2Bytes.h | 0 .../TileByteStream/TileRawChannel2Bytes2.h | 0 .../TileByteStream/TileRawChannel2Bytes4.h | 0 .../TileRawChannelContByteStreamCnv.h | 0 .../TileRawChannelContByteStreamTool.h | 0 .../TileSvc/TileByteStream/cmt/requirements | 1 + .../share/PrepareTileBS_jobOptions.py | 0 .../share/ReadTileBS_jobOptions.py | 0 .../share/ReadTileCellBS_jobOptions.py | 0 .../share/TileByteStream_jobOptions.py | 0 .../share/WriteTileBS_jobOptions.py | 0 .../share/jobOptions_ReadTileBS.py | 0 .../share/jobOptions_WriteTileBS.py | 0 .../src/TileBeamElemContByteStreamCnv.cxx | 0 .../TileByteStream/src/TileCellCont.cxx | 0 .../TileByteStream/src/TileDigits2Bytes.cxx | 0 .../src/TileDigitsContByteStreamCnv.cxx | 0 .../TileByteStream/src/TileHid2RESrcID.cxx | 0 .../src/TileL2ContByteStreamCnv.cxx | 0 .../src/TileL2ContByteStreamTool.cxx | 0 .../src/TileMuRcvContByteStreamCnv.cxx | 0 .../src/TileMuRcvContByteStreamTool.cxx | 0 .../TileByteStream/src/TileROD_Decoder.cxx | 0 .../TileByteStream/src/TileROD_Encoder.cxx | 0 .../src/TileRawChannel2Bytes.cxx | 0 .../src/TileRawChannel2Bytes2.cxx | 0 .../src/TileRawChannel2Bytes4.cxx | 0 .../src/TileRawChannelContByteStreamCnv.cxx | 0 .../src/TileRawChannelContByteStreamTool.cxx | 0 .../src/components/TileByteStream_entries.cxx | 0 .../src/components/TileByteStream_load.cxx | 0 43 files changed, 36 insertions(+), 30 deletions(-) mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileCellCont.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigits2Bytes.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileHid2RESrcID.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamTool.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamTool.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Decoder.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Encoder.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamTool.h mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/cmt/requirements mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/PrepareTileBS_jobOptions.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/ReadTileBS_jobOptions.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/ReadTileCellBS_jobOptions.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/TileByteStream_jobOptions.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/WriteTileBS_jobOptions.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_ReadTileBS.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_WriteTileBS.py mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileCellCont.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileDigits2Bytes.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes2.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes4.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamTool.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx mode change 100755 => 100644 TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx diff --git a/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt b/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt index 51ce129f102..66584f08247 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt +++ b/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt @@ -1,3 +1,4 @@ +# $Id: CMakeLists.txt 757198 2016-06-23 10:12:56Z krasznaa $ ################################################################################ # Package: TileByteStream ################################################################################ @@ -6,43 +7,47 @@ atlas_subdir( TileByteStream ) # Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - Control/AthenaBaseComps - Control/AthenaKernel - Event/ByteStreamCnvSvcBase - Event/ByteStreamData - GaudiKernel - TileCalorimeter/TileEvent - TileCalorimeter/TileIdentifier - PRIVATE - Calorimeter/CaloDetDescr - Calorimeter/CaloIdentifier - Control/CLIDSvc - Control/SGTools - Control/StoreGate - Event/ByteStreamCnvSvc - TileCalorimeter/TileCalib/TileCalibBlobObjs - TileCalorimeter/TileConditions - TileCalorimeter/TileDetDescr - TileCalorimeter/TileL2Algs - TileCalorimeter/TileRecUtils ) +atlas_depends_on_subdirs( + PUBLIC + Control/AthenaBaseComps + Control/AthenaKernel + Event/ByteStreamCnvSvcBase + Event/ByteStreamData + GaudiKernel + TileCalorimeter/TileEvent + TileCalorimeter/TileIdentifier + PRIVATE + Calorimeter/CaloDetDescr + Calorimeter/CaloIdentifier + Control/CLIDSvc + Control/SGTools + Control/StoreGate + Event/ByteStreamCnvSvc + TileCalorimeter/TileCalib/TileCalibBlobObjs + TileCalorimeter/TileConditions + TileCalorimeter/TileDetDescr + TileCalorimeter/TileL2Algs + TileCalorimeter/TileRecUtils ) # External dependencies: -find_package( tdaq-common ) +find_package( tdaq-common COMPONENTS eformat eformat_write ) # Component(s) in the package: atlas_add_library( TileByteStreamLib - src/Tile*.cxx - PUBLIC_HEADERS TileByteStream - INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} - LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamData GaudiKernel TileEvent TileIdentifier ByteStreamCnvSvcBaseLib ByteStreamData_test CaloDetDescrLib StoreGateLib SGtests ByteStreamCnvSvcLib TileConditionsLib TileL2AlgsLib TileRecUtilsLib - PRIVATE_LINK_LIBRARIES CaloIdentifier SGTools TileCalibBlobObjs TileDetDescr ) + TileByteStream/*.h TileByteStream/*.icc src/*.cxx + PUBLIC_HEADERS TileByteStream + INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} + LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel + ByteStreamData GaudiKernel TileEvent TileIdentifier ByteStreamCnvSvcBaseLib + CaloDetDescrLib StoreGateLib ByteStreamCnvSvcLib TileConditionsLib + TileL2AlgsLib TileRecUtilsLib + PRIVATE_LINK_LIBRARIES CaloIdentifier SGTools TileCalibBlobObjs + TileDetDescr ) atlas_add_component( TileByteStream - src/components/*.cxx - INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} - LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel TileEvent TileIdentifier CaloDetDescrLib CaloIdentifier SGTools StoreGateLib SGtests ByteStreamCnvSvcLib TileCalibBlobObjs TileConditionsLib TileDetDescr TileL2AlgsLib TileRecUtilsLib TileByteStreamLib ) + src/components/*.cxx + INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} + LINK_LIBRARIES TileByteStreamLib ) # Install files from the package: atlas_install_joboptions( share/*.py ) - diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileBeamElemContByteStreamCnv.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileCellCont.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileCellCont.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigits2Bytes.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigits2Bytes.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileHid2RESrcID.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileHid2RESrcID.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamCnv.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamTool.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileL2ContByteStreamTool.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamCnv.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamTool.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileMuRcvContByteStreamTool.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Decoder.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Decoder.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Encoder.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileROD_Encoder.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamTool.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamTool.h old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements b/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements old mode 100755 new mode 100644 index adde772d013..59a5fdb72cb --- a/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements +++ b/TileCalorimeter/TileSvc/TileByteStream/cmt/requirements @@ -32,3 +32,4 @@ end_private apply_pattern dual_use_library files="Tile*.cxx" apply_pattern declare_joboptions files="*.py" + diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/PrepareTileBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/PrepareTileBS_jobOptions.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileBS_jobOptions.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileCellBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/ReadTileCellBS_jobOptions.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileByteStream_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/TileByteStream_jobOptions.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/WriteTileBS_jobOptions.py b/TileCalorimeter/TileSvc/TileByteStream/share/WriteTileBS_jobOptions.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_ReadTileBS.py b/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_ReadTileBS.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_WriteTileBS.py b/TileCalorimeter/TileSvc/TileByteStream/share/jobOptions_WriteTileBS.py old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileBeamElemContByteStreamCnv.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileCellCont.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileCellCont.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigits2Bytes.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigits2Bytes.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamCnv.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileL2ContByteStreamTool.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamTool.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes2.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes2.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes4.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes4.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamTool.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamTool.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx old mode 100755 new mode 100644 diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx old mode 100755 new mode 100644 -- GitLab