From e4bf7fe36a483cbd6b41884ebfa299259457f54e Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <krasznaa@cern.ch>
Date: Thu, 23 Jun 2016 09:39:29 +0200
Subject: [PATCH] Adding some missing libraries to link this package against
(TBCnv-00-03-25)
2016-06-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Making the package link against the necessary tdaq-common
libraries. To make it possible to turn on using -Wl,--no-undefined
in the build.
* Removed the executable flag from all of the files in the package.
* Tagging as TBCnv-00-03-25
Former-commit-id: 5b7ca15de92a84cd22cc1d24330b125f7d48acff
---
TestBeam/TBCnv/CMakeLists.txt | 52 ++++++++++---------
TestBeam/TBCnv/TBCnv/ReadTBLArCalibDigits.h | 0
TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h | 0
TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h | 0
TestBeam/TBCnv/TBCnv/TBCheckBCIDs.h | 0
TestBeam/TBCnv/TBCnv/TBDataCnv.h | 0
TestBeam/TBCnv/TBCnv/TBDataCnv.icc | 0
TestBeam/TBCnv/cmt/requirements | 1 -
TestBeam/TBCnv/share/CheckBCIDs.py | 0
TestBeam/TBCnv/share/H6ADCChannelNames.py | 0
TestBeam/TBCnv/share/H6TDCChannelNames.py | 0
TestBeam/TBCnv/share/H8ADCChannelNames.py | 0
TestBeam/TBCnv/share/H8TDCChannelNames.py | 0
TestBeam/TBCnv/share/TBH6ByteStream-Calib.py | 0
.../TBH6ByteStream-Monitor-EventStorage.py | 0
.../TBCnv/share/TBH6ByteStream-Monitor.py | 0
.../share/TBReadH6BS_Calib_jobOptions.py | 0
.../TBReadH6BS_EventStorage_jobOptions.py | 0
TestBeam/TBCnv/share/TBReadH6BS_jobOptions.py | 0
.../TBReadH6ByteStream-Monitor_jobOptions.py | 0
.../TBCnv/share/TBReadH6ByteStream-Print.py | 0
.../TBReadH8BS_EventStorage_jobOptions.py | 0
TestBeam/TBCnv/share/TBReadH8BS_jobOptions.py | 0
.../TBReadH8ByteStream-Monitor_jobOptions.py | 0
TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx | 0
TestBeam/TBCnv/src/ReadTBLArDigits.cxx | 0
TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx | 0
TestBeam/TBCnv/src/TBCheckBCIDs.cxx | 0
.../TBCnv/src/components/TBCnv_entries.cxx | 0
TestBeam/TBCnv/src/components/TBCnv_load.cxx | 0
30 files changed, 27 insertions(+), 26 deletions(-)
mode change 100755 => 100644 TestBeam/TBCnv/TBCnv/ReadTBLArCalibDigits.h
mode change 100755 => 100644 TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
mode change 100755 => 100644 TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
mode change 100755 => 100644 TestBeam/TBCnv/TBCnv/TBCheckBCIDs.h
mode change 100755 => 100644 TestBeam/TBCnv/TBCnv/TBDataCnv.h
mode change 100755 => 100644 TestBeam/TBCnv/TBCnv/TBDataCnv.icc
mode change 100755 => 100644 TestBeam/TBCnv/cmt/requirements
mode change 100755 => 100644 TestBeam/TBCnv/share/CheckBCIDs.py
mode change 100755 => 100644 TestBeam/TBCnv/share/H6ADCChannelNames.py
mode change 100755 => 100644 TestBeam/TBCnv/share/H6TDCChannelNames.py
mode change 100755 => 100644 TestBeam/TBCnv/share/H8ADCChannelNames.py
mode change 100755 => 100644 TestBeam/TBCnv/share/H8TDCChannelNames.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBH6ByteStream-Calib.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH6BS_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH6ByteStream-Monitor_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH8BS_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/share/TBReadH8ByteStream-Monitor_jobOptions.py
mode change 100755 => 100644 TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx
mode change 100755 => 100644 TestBeam/TBCnv/src/ReadTBLArDigits.cxx
mode change 100755 => 100644 TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
mode change 100755 => 100644 TestBeam/TBCnv/src/TBCheckBCIDs.cxx
mode change 100755 => 100644 TestBeam/TBCnv/src/components/TBCnv_entries.cxx
mode change 100755 => 100644 TestBeam/TBCnv/src/components/TBCnv_load.cxx
diff --git a/TestBeam/TBCnv/CMakeLists.txt b/TestBeam/TBCnv/CMakeLists.txt
index 96c991555e5..ea6e5d11682 100644
--- a/TestBeam/TBCnv/CMakeLists.txt
+++ b/TestBeam/TBCnv/CMakeLists.txt
@@ -1,3 +1,4 @@
+# $Id: CMakeLists.txt 757192 2016-06-23 09:39:00Z krasznaa $
################################################################################
# Package: TBCnv
################################################################################
@@ -6,38 +7,39 @@
atlas_subdir( TBCnv )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/StoreGate
- Event/ByteStreamCnvSvc
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- Event/EventInfo
- GaudiKernel
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArTools
- TestBeam/TBEvent
- PRIVATE
- DetectorDescription/Identifier
- LArCalorimeter/LArRawEvent )
+atlas_depends_on_subdirs(
+ PUBLIC
+ Calorimeter/CaloIdentifier
+ Control/AthenaBaseComps
+ Control/StoreGate
+ Event/ByteStreamCnvSvc
+ Event/ByteStreamCnvSvcBase
+ Event/ByteStreamData
+ Event/EventInfo
+ GaudiKernel
+ LArCalorimeter/LArIdentifier
+ LArCalorimeter/LArTools
+ TestBeam/TBEvent
+ PRIVATE
+ DetectorDescription/Identifier
+ LArCalorimeter/LArRawEvent )
# External dependencies:
-find_package( tdaq-common )
+find_package( tdaq-common COMPONENTS eformat eformat_write )
# Component(s) in the package:
atlas_add_library( TBCnvLib
- src/*.cxx
- PUBLIC_HEADERS TBCnv
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps ByteStreamData EventInfo GaudiKernel LArIdentifier TBEvent StoreGateLib SGtests ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib ByteStreamData_test LArToolsLib
- PRIVATE_LINK_LIBRARIES Identifier LArRawEvent )
+ TBCnv/*.h TBCnv/*.icc src/*.cxx
+ PUBLIC_HEADERS TBCnv
+ INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps
+ ByteStreamData EventInfo GaudiKernel LArIdentifier TBEvent StoreGateLib
+ ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArToolsLib
+ PRIVATE_LINK_LIBRARIES Identifier LArRawEvent )
atlas_add_component( TBCnv
- src/components/*.cxx
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test EventInfo GaudiKernel LArIdentifier LArToolsLib TBEvent Identifier LArRawEvent TBCnvLib )
+ src/components/*.cxx
+ LINK_LIBRARIES TBCnvLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
diff --git a/TestBeam/TBCnv/TBCnv/ReadTBLArCalibDigits.h b/TestBeam/TBCnv/TBCnv/ReadTBLArCalibDigits.h
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h b/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h b/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/TBCnv/TBCheckBCIDs.h b/TestBeam/TBCnv/TBCnv/TBCheckBCIDs.h
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/TBCnv/TBDataCnv.h b/TestBeam/TBCnv/TBCnv/TBDataCnv.h
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/TBCnv/TBDataCnv.icc b/TestBeam/TBCnv/TBCnv/TBDataCnv.icc
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/cmt/requirements b/TestBeam/TBCnv/cmt/requirements
old mode 100755
new mode 100644
index 5aa7d5d9c9a..5f085e4d2b2
--- a/TestBeam/TBCnv/cmt/requirements
+++ b/TestBeam/TBCnv/cmt/requirements
@@ -26,4 +26,3 @@ use LArRawEvent LArRawEvent-* LArCalorimeter
apply_pattern dual_use_library files=*.cxx
apply_pattern declare_joboptions files="*.txt *.py"
-
diff --git a/TestBeam/TBCnv/share/CheckBCIDs.py b/TestBeam/TBCnv/share/CheckBCIDs.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/H6ADCChannelNames.py b/TestBeam/TBCnv/share/H6ADCChannelNames.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/H6TDCChannelNames.py b/TestBeam/TBCnv/share/H6TDCChannelNames.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/H8ADCChannelNames.py b/TestBeam/TBCnv/share/H8ADCChannelNames.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/H8TDCChannelNames.py b/TestBeam/TBCnv/share/H8TDCChannelNames.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Calib.py b/TestBeam/TBCnv/share/TBH6ByteStream-Calib.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py b/TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py b/TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH6BS_jobOptions.py b/TestBeam/TBCnv/share/TBReadH6BS_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH6ByteStream-Monitor_jobOptions.py b/TestBeam/TBCnv/share/TBReadH6ByteStream-Monitor_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py b/TestBeam/TBCnv/share/TBReadH6ByteStream-Print.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py b/TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH8BS_jobOptions.py b/TestBeam/TBCnv/share/TBReadH8BS_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/share/TBReadH8ByteStream-Monitor_jobOptions.py b/TestBeam/TBCnv/share/TBReadH8ByteStream-Monitor_jobOptions.py
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx b/TestBeam/TBCnv/src/ReadTBLArCalibDigits.cxx
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/src/ReadTBLArDigits.cxx b/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/src/TBCheckBCIDs.cxx b/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
old mode 100755
new mode 100644
diff --git a/TestBeam/TBCnv/src/components/TBCnv_load.cxx b/TestBeam/TBCnv/src/components/TBCnv_load.cxx
old mode 100755
new mode 100644
--
GitLab