Use new Gaudi CMake style configuration (!33) · Merge requests · LHCb / Detector · GitLab

Snippets Groups Projects

Merged Marco Clemencic requested to merge use-new-gaudi-cmake-style into master 5 years ago

All threads resolved!

now that the nightly builds can transparently build projects using the new configuration style of Gaudi (basically standard CMake projects), we can clean Detector from all the related hacks.

To do:

drop FindGitCondDB.cmake (requires %0.1.2 in GitCondDB)
fix implementation of run script (it might be possible to use the toolchain generated wrapper script, see https://gitlab.cern.ch/lhcb-core/lcg-toolchains/-/blob/b4722c43d58ffaf6d4aa495b90f77a679651ffd1/fragments/main.cmake#L70)
remove unused bits from old-style configuration in cmake directory

Requires lhcb-core/LbDevTools!117 (merged)

Edited 4 years ago by Marco Clemencic

Approval is optional

Activity

Marco Clemencic changed the description 5 years ago

changed the description

Ben Couturier @bcouturi · 5 years ago

Owner

Hi, how do you compile this, for me it still complains with:

CMake Error at cmake/GaudiToolchainMacros.cmake:59 (message):
  /home/lben/test_for_marco/Detector/CMakeLists.txt does not contain
  gaudi_project or athena_project
Call Stack (most recent call first):
  cmake/GaudiToolchainMacros.cmake:148 (_internal_find_projects)
  cmake/GaudiDefaultToolchain.cmake:6 (find_projects)
  toolchain.cmake:25 (include)
  /cvmfs/lhcb.cern.ch/lib/contrib/CMake/3.16.2/Linux-x86_64/share/cmake-3.16/Modules/CMakeDetermineSystem.cmake:93 (include)
  CMakeLists.txt:13 (project)

Edited 5 years ago by Ben Couturier

Marco Clemencic added 1 commit 5 years ago
added 1 commit

b8c5180d - Run builds in CI jobs

Compare with previous version
Marco Clemencic added 1 commit 5 years ago
added 1 commit

4eed3933 - prevent lbdocker containers to start LbLogin/LbEnv

Compare with previous version
C

Marco Clemencic @clemenci · 5 years ago

Author Owner

The answer to your question is in b8c5180d.

The old style toolchain used to complain about gaudi_project, but I fixed is recently in lhcb-core/LbDevTools!93 (merged), so you need, at least to update the cmake directory, but I'd rather remove all the legacy stuff using this MR.
Marco Clemencic changed the description 5 years ago

changed the description
Marco Clemencic added 2 commits 5 years ago
added 2 commits

9bae86bb - Remove obsolete toolchain

4e878f41 - Use toolchain wrapper script as base to build therun script

Compare with previous version
Marco Clemencic added 1 commit 5 years ago
added 1 commit

3e2d56cd - Reduce scope of CMAKE_COMMAND override

Compare with previous version
L
Software for LHCb @lhcbsoft · 5 years ago

Developer
[2020-04-08 01:10] Validation started with lhcb-dd4hep#471

[2020-04-08 08:38] Validation started with lhcb-dd4hep#472

[2020-04-08 11:25] Validation started with lhcb-dd4hep#473

[2020-04-08 11:55] Validation started with lhcb-dd4hep#474

[2020-04-08 15:31] Validation started with lhcb-dd4hep#475

[2020-04-09 00:10] Validation started with lhcb-dd4hep#476

[2020-04-10 00:11] Validation started with lhcb-dd4hep#477

[2020-04-11 00:09] Validation started with lhcb-dd4hep#478

[2020-04-14 10:59] Validation started with lhcb-dd4hep#479

[2020-04-14 12:21] Validation started with lhcb-dd4hep#480

[2020-04-15 00:07] Validation started with lhcb-dd4hep#481

[2020-04-15 08:29] Validation started with lhcb-dd4hep#482

[2020-04-15 19:12] Validation started with lhcb-dd4hep#483

[2020-04-16 00:09] Validation started with lhcb-dd4hep#484

[2020-04-16 12:48] Validation started with lhcb-dd4hep#485

[2020-04-16 14:38] Validation started with lhcb-dd4hep#486

[2020-04-17 00:05] Validation started with lhcb-dd4hep#487

[2020-04-17 08:58] Validation started with lhcb-dd4hep#488

[2020-04-18 09:38] Validation started with lhcb-dd4hep#490

[2020-04-22 00:12] Validation started with lhcb-dd4hep#491

[2020-04-22 08:57] Validation started with lhcb-dd4hep#492

Edited 4 years ago by Software for LHCb
Marco Clemencic added 1 commit 5 years ago
added 1 commit

2a14205c - fixup! Use standard CMake install prefix

Compare with previous version
Marco Clemencic added 1 commit 5 years ago
added 1 commit

19b6f9af - fixup! Use standard CMake install prefix

Compare with previous version
Marco Clemencic added 1 commit 5 years ago
added 1 commit

6ae151e1 - Use custom (less hacky) implementation of dd4hep_add_plugin

Compare with previous version
Marco Clemencic added 1 commit 5 years ago
added 1 commit

438a945a - Drop requirement for Geant4

Compare with previous version
Marco Clemencic mentioned in merge request LHCb!2455 (merged) 5 years ago

mentioned in merge request LHCb!2455 (merged)
Marco Clemencic added 2 commits 5 years ago
added 2 commits

e7999a89 - Remove special hacks for problematic toolchains

c23e684b - Use GitCondDBConfig.cmake

Compare with previous version
Marco Clemencic added 1 commit 5 years ago
added 1 commit

c428b89a - Use GitCondDBConfig.cmake

Compare with previous version
Marco Clemencic added 17 commits 4 years ago
added 17 commits

c428b89a...7a0edb49 - 2 commits from branch master

4154a4b3 - Let the user choose the build type

3b9e8d07 - Drop gaudi_project and special targets

b4bf2814 - Use standard CMake install prefix

b369b56e - Do not use special GitCondDB and DD4hep search

785d9b1b - Use LegacyGaudiCMakeSupport.cmake for manifest and xenv files

d1f15f46 - Run builds in CI jobs

00f9f939 - prevent lbdocker containers to start LbLogin/LbEnv

d2519b98 - Remove obsolete toolchain

8f7af9ab - Use toolchain wrapper script as base to build therun script

1810a203 - Reduce scope of CMAKE_COMMAND override

690a6c17 - Use custom (less hacky) implementation of dd4hep_add_plugin

120b47ef - Drop requirement for Geant4

6e450fe5 - Remove special hacks for problematic toolchains

b6730d09 - Use GitCondDBConfig.cmake

b42ecb91 - Remove unused cmake files

Compare with previous version
Toggle commit list
Marco Clemencic added 2 commits 4 years ago
added 2 commits

1dc76525 - Drop unneeded settings and dependencies

acab1789 - Improve test scaffolding

Compare with previous version
Marco Clemencic marked the checklist item drop FindGitCondDB.cmake (requires %0.1.2 in GitCondDB) as completed 4 years ago

marked the checklist item drop FindGitCondDB.cmake (requires %0.1.2 in GitCondDB) as completed
Marco Clemencic marked the checklist item remove unused bits from old-style configuration in cmake directory as completed 4 years ago

marked the checklist item remove unused bits from old-style configuration in cmake directory as completed
Marco Clemencic added 1 commit 4 years ago
added 1 commit

5b4b1ee5 - temporary! test for tesing in ci

Compare with previous version
Marco Clemencic added 10 commits 4 years ago
added 10 commits

89ebca0f - Use toolchain wrapper script as base to build therun script

631775b1 - Reduce scope of CMAKE_COMMAND override

007b44ed - Use custom (less hacky) implementation of dd4hep_add_plugin

66d5e8e1 - Drop requirement for Geant4

0bd0ea75 - Remove special hacks for problematic toolchains

5f5ba9d5 - Use GitCondDBConfig.cmake

2637eafc - Remove unused cmake files

10162053 - Drop unneeded settings and dependencies

707b977e - Improve test scaffolding

90ab3171 - temporary! test for tesing in ci

Compare with previous version
Toggle commit list
Marco Clemencic marked the checklist item fix implementation of run script (it might be possible to use the toolchain generated wrapper script, see https://gitlab.cern.ch/lhcb-core/lcg-toolchains/-/blob/b4722c43d58ffaf6d4aa495b90f77a679651ffd1/fragments/main.cmake#L70) as completed 4 years ago

marked the checklist item fix implementation of run script (it might be possible to use the toolchain generated wrapper script, see https://gitlab.cern.ch/lhcb-core/lcg-toolchains/-/blob/b4722c43d58ffaf6d4aa495b90f77a679651ffd1/fragments/main.cmake#L70) as completed
Marco Clemencic added 11 commits 4 years ago
added 11 commits

b1256f0d - Use toolchain wrapper script as base to build the run script

6ef9aa7c - Reduce scope of CMAKE_COMMAND override

a45cebc4 - Use custom (less hacky) implementation of dd4hep_add_plugin

817dfa90 - Drop requirement for Geant4

fdc2f369 - Remove special hacks for problematic toolchains

b785a7cd - Use GitCondDBConfig.cmake

2e2b116c - Remove unused cmake files

76c8173c - Drop unneeded settings and dependencies

97d5befb - Improve test scaffolding

0f956146 - Minor clean up

c8051c70 - temporary! test for tesing in ci

Compare with previous version
Toggle commit list
Marco Clemencic added 2 commits 4 years ago
added 2 commits

093453c2 - Minor clean up

c653df7c - Wrap plugin generation boilerplate in a function

Compare with previous version
Marco Clemencic unmarked as a Work In Progress 4 years ago

unmarked as a Work In Progress
Marco Clemencic added 1 commit 4 years ago
added 1 commit

eea445ca - Use LCG 97 in gitlab-ci

Compare with previous version
Ben Couturier merged 4 years ago

merged
Ben Couturier mentioned in commit a5beb97c 4 years ago

mentioned in commit a5beb97c
Marco Clemencic @clemenci started a thread on the diff 4 years ago

Resolved 4 years ago by Marco Clemencic
Last reply by Marco Clemencic 4 years ago

Marco Clemencic resolved all threads 4 years ago

resolved all threads

Marco Clemencic mentioned in issue #2 4 years ago

mentioned in issue #2

Please register or sign in to reply