Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit c38283a

Browse files
committed
Use set(LIBRARY_NAME ${MODULE_NAME})
Changed TPCsimulation -> TPCSimulation Changed TPCbase -> TPCBase Changed itsBase -> ITSBase Renamed itsSimulation -> ITSSimulation Renamed Bucket -> bucket for consistency Removed unnecessary itsmft/ and o2cdb/ directories
1 parent 4d37524 commit c38283a

135 files changed

Lines changed: 226 additions & 660 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CCDB/CMakeLists-2.txt

Lines changed: 0 additions & 130 deletions
This file was deleted.

CCDB/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Set(NO_DICT_SRCS
3535
src/ConditionsMQClient.cxx
3636
)
3737

38-
set(LIBRARY_NAME CCDB)
38+
set(LIBRARY_NAME ${MODULE_NAME})
3939
set(LINKDEF src/CCDBLinkDef.h)
40-
set(BUCKET_NAME CCDB_Bucket)
40+
set(BUCKET_NAME CCDB_bucket)
4141

4242
O2_GENERATE_LIBRARY()
4343

@@ -52,8 +52,8 @@ Set(Exe_Source
5252
)
5353

5454
# todo we repeat ourselves because the macro O2_GENERATE_LIBRARY dares deleting the variables we pass to it.
55-
set(LIBRARY_NAME CCDB)
56-
set(BUCKET_NAME CCDB_Bucket)
55+
set(LIBRARY_NAME ${MODULE_NAME})
56+
set(BUCKET_NAME CCDB_bucket)
5757

5858
list(LENGTH Exe_Names _length)
5959
math(EXPR _length ${_length}-1)
@@ -77,4 +77,4 @@ install(
7777
config/conditions-client.json
7878
example/fill_local_ocdb.C
7979
DESTINATION bin/config
80-
)
80+
)

Common/Field/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(HEADERS
1212
include/${MODULE_NAME}/MagneticField.h
1313
)
1414
set(LINKDEF src/FieldLinkDef.h)
15-
set(LIBRARY_NAME Field)
15+
set(LIBRARY_NAME ${MODULE_NAME})
1616
set(BUCKET_NAME common_field_bucket)
1717

1818
O2_GENERATE_LIBRARY()

Common/MathUtils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(HEADERS
1212
include/${MODULE_NAME}/Chebyshev3DCalc.h
1313
)
1414
set(LINKDEF src/MathUtilsLinkDef.h)
15-
set(LIBRARY_NAME MathUtils)
15+
set(LIBRARY_NAME ${MODULE_NAME})
1616
set(BUCKET_NAME common_math_bucket)
1717

1818
O2_GENERATE_LIBRARY()

Detectors/Base/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Set(HEADERS
1212
include/${MODULE_NAME}/Detector.h
1313
)
1414
Set(LINKDEF src/BaseLinkDef.h)
15-
Set(LIBRARY_NAME ${MODULE_NAME})#AliceO2Base)
15+
Set(LIBRARY_NAME ${MODULE_NAME})
1616
set(BUCKET_NAME detectors_base)
1717

1818
O2_GENERATE_LIBRARY()

Detectors/ITSMFT/ITS/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515

1616
# Libraries
1717
add_subdirectory(base)
18-
#add_subdirectory(reconstruction)
1918
add_subdirectory(simulation)

Detectors/ITSMFT/ITS/base/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(MODULE_NAME "itsBase")
1+
set(MODULE_NAME "ITSBase")
22

33
O2_SETUP(NAME ${MODULE_NAME})
44

@@ -13,8 +13,8 @@ set(HEADERS
1313
)
1414

1515

16-
Set(LINKDEF src/itsBaseLinkDef.h)
17-
Set(LIBRARY_NAME itsBase)
16+
Set(LINKDEF src/ITSBaseLinkDef.h)
17+
Set(LIBRARY_NAME ${MODULE_NAME})
1818
set(BUCKET_NAME its_base_bucket)
1919

2020
O2_GENERATE_LIBRARY()

Detectors/ITSMFT/ITS/base/include/itsBase/ContainerFactory.h renamed to Detectors/ITSMFT/ITS/base/include/ITSBase/ContainerFactory.h

File renamed without changes.

Detectors/ITSMFT/ITS/base/include/itsBase/MisalignmentParameter.h renamed to Detectors/ITSMFT/ITS/base/include/ITSBase/MisalignmentParameter.h

File renamed without changes.

Detectors/ITSMFT/ITS/base/src/ContainerFactory.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// \file ContainerFactory.cxx
22
/// \brief Implementation of the ContainerFactory class
33

4-
#include "itsBase/ContainerFactory.h"
4+
#include "ITSBase/ContainerFactory.h"
55
#include "FairRuntimeDb.h" // for FairRuntimeDb
66
#include "TString.h" // for TString
77

0 commit comments

Comments
 (0)