Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LHCb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LHCb
LHCb
Commits
cd6bc534
Commit
cd6bc534
authored
3 years ago
by
Christoph Hasse
Browse files
Options
Downloads
Plain Diff
Merge branch 'cmake-fix' into 'master'
Minor CMake fixes See merge request
!3250
parents
e3d8878c
f62d34d2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3250
Minor CMake fixes
Pipeline
#3015093
passed
3 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Event/TrackEvent/CMakeLists.txt
+1
-0
1 addition, 0 deletions
Event/TrackEvent/CMakeLists.txt
cmake/LHCbConfigUtils.cmake
+4
-0
4 additions, 0 deletions
cmake/LHCbConfigUtils.cmake
with
5 additions
and
0 deletions
Event/TrackEvent/CMakeLists.txt
+
1
−
0
View file @
cd6bc534
...
...
@@ -28,6 +28,7 @@ gaudi_add_library(TrackEvent
Gaudi::GaudiKernel
GSL::gsl
LHCb::EventBase
LHCb::FTDAQLib
LHCb::LHCbKernel
LHCb::LHCbMathLib
Rangev3::rangev3
...
...
This diff is collapsed.
Click to expand it.
cmake/LHCbConfigUtils.cmake
+
4
−
0
View file @
cd6bc534
...
...
@@ -265,6 +265,10 @@ macro(lhcb_finalize_configuration)
gaudi_install
(
CMAKE lhcbproject.yml
)
endif
()
# Set the version of the project as a cache variable to be seen by other
# projects in the same super-project.
set
(
${
PROJECT_NAME
}
_VERSION
"
${
PROJECT_VERSION
}
"
CACHE STRING
"Version of
${
PROJECT_NAME
}
"
FORCE
)
if
(
CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND GAUDI_LEGACY_CMAKE_SUPPORT
)
find_file
(
legacy_cmake_config_support NAMES LegacyGaudiCMakeSupport.cmake
)
if
(
legacy_cmake_config_support
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment