Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computing
cbmroot
Merge requests
!57
WIP: Test
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Closed
WIP: Test
f.uhlig/cbmroot:cleanup_norbert
into
master
Overview
9
Commits
82
Pipelines
18
Changes
150
Closed
Florian Uhlig
requested to merge
f.uhlig/cbmroot:cleanup_norbert
into
master
5 years ago
Overview
5
Commits
82
Pipelines
18
Changes
150
0
0
Merge request reports
Compare
master
version 18
3b204b40
4 years ago
version 17
6c514333
4 years ago
version 16
ee816a2d
4 years ago
version 15
e29d4712
5 years ago
version 14
a4fe2c42
5 years ago
version 13
7085267d
5 years ago
version 12
9abf65e1
5 years ago
version 11
b42012bb
5 years ago
version 10
bf9ed375
5 years ago
version 9
916c01c7
5 years ago
version 8
62ccbaf8
5 years ago
version 7
36ce7743
5 years ago
version 6
3ae551a5
5 years ago
version 5
9fdcdb1c
5 years ago
version 4
fff348b5
5 years ago
version 3
2ec1a65f
5 years ago
version 2
8d6c9127
5 years ago
version 1
61c46cd2
5 years ago
master (base)
and
latest version
latest version
3b204b40
82 commits,
4 years ago
version 18
3b204b40
82 commits,
4 years ago
version 17
6c514333
82 commits,
4 years ago
version 16
ee816a2d
82 commits,
4 years ago
version 15
e29d4712
81 commits,
5 years ago
version 14
a4fe2c42
82 commits,
5 years ago
version 13
7085267d
81 commits,
5 years ago
version 12
9abf65e1
79 commits,
5 years ago
version 11
b42012bb
75 commits,
5 years ago
version 10
bf9ed375
75 commits,
5 years ago
version 9
916c01c7
75 commits,
5 years ago
version 8
62ccbaf8
74 commits,
5 years ago
version 7
36ce7743
85 commits,
5 years ago
version 6
3ae551a5
85 commits,
5 years ago
version 5
9fdcdb1c
84 commits,
5 years ago
version 4
fff348b5
83 commits,
5 years ago
version 3
2ec1a65f
72 commits,
5 years ago
version 2
8d6c9127
72 commits,
5 years ago
version 1
61c46cd2
71 commits,
5 years ago
150 files
+
20338
−
3106
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
150
MQ/hitbuilder/CMakeLists.txt
+
5
−
9
View file @ 3b204b40
Show full file
@@ -4,14 +4,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startMQ_Mcbm.sh.in ${CMAKE_BINARY_DIR
set
(
INCLUDE_DIRECTORIES
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CBMROOT_SOURCE_DIR
}
/fles/cern2016/param
${
CBMROOT_SOURCE_DIR
}
/fles/cern2016/unpacker
${
CBMROOT_SOURCE_DIR
}
/beamtime/base
${
CBMDATA_DIR
}
${
CBMDATA_DIR
}
/base
${
CBMDATA_DIR
}
/tof
${
CBMBASE_DIR
}
${
CBMROOT_SOURCE_DIR
}
/tof/TofParam
${
CBMROOT_SOURCE_DIR
}
/tof/TofTools
${
CBMDETECTORBASE_DIR
}
/tof
)
Set
(
SYSTEM_INCLUDE_DIRECTORIES
@@ -23,8 +20,8 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${
FAIRMQ_INCLUDE_DIR
}
/options
${
IPC_INCLUDE_DIRECTORY
}
${
CBMROOT_SOURCE_DIR
}
/external/cppzmq
${
CBMROOT_SOURCE_DIR
}
/
tof/TofReco
${
CBMROOT_SOURCE_DIR
}
/external/cppzmq
${
CBMROOT_SOURCE_DIR
}
/
reco/detectors/tof
)
include_directories
(
${
INCLUDE_DIRECTORIES
}
)
@@ -72,10 +69,9 @@ set(DEPENDENCIES
${
FAIR_LIBS
}
${
BOOST_LIBS
}
# fles_ipc
CbmFlibCern2016
CbmBase
CbmData
CbmTof
CbmTof
Base
Geom
Core
MathCore
Loading