Merge branch 'main' into fix-applying-geomodel-patch

acts-project · Jun 5, 2024 · fa4a70a
2 parents 1de5eb1 + 5885ee8
commit fa4a70a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
@@ -51,7 +51,6 @@ jobs:
  -DACTS_BUILD_EVERYTHING=ON
  -DACTS_BUILD_ODD=ON
  -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
- -DACTS_BUILD_EXAMPLES_BINARIES=ON
  -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
 
  - name: Run IWYU

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -177,7 +177,6 @@ build_linux_ubuntu:
  -DACTS_BUILD_EVERYTHING=ON
  -DACTS_BUILD_ODD=ON
  -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
- -DACTS_BUILD_EXAMPLES_BINARIES=ON
  -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
  -DACTS_FORCE_ASSERTIONS=ON
  -DACTS_BUILD_ANALYSIS_APPS=ON

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,7 +128,6 @@ set_option_if(
  OR ACTS_BUILD_EXAMPLES_PYTHIA8
  OR ACTS_BUILD_EXAMPLES_EXATRKX
  OR ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS
- OR ACTS_BUILD_EXAMPLES_BINARIES
  OR ACTS_BUILD_EVERYTHING)
 # core plugins might be required by examples or depend on each other
 
@@ -221,8 +220,7 @@ if (ACTS_SETUP_BOOST)
 
  # Enable both program_options and unit_test_framework to reduce complexity
  # Also Cuda tests seem to use program_options
- if( ACTS_BUILD_EXAMPLES_BINARIES OR ACTS_BUILD_ANALYSIS_APPS OR
- ACTS_BUILD_UNITTESTS OR ACTS_BUILD_INTEGRATIONTESTS OR ACTS_BUILD_BENCHMARKS )
+ if( ACTS_BUILD_ANALYSIS_APPS OR ACTS_BUILD_UNITTESTS OR ACTS_BUILD_INTEGRATIONTESTS OR ACTS_BUILD_BENCHMARKS )
  find_package(Boost ${_acts_boost_version} REQUIRED COMPONENTS program_options unit_test_framework)
  else()
  find_package(Boost ${_acts_boost_version} REQUIRED COMPONENTS)

diff --git a/Examples/Io/EDM4hep/src/EDM4hepSimHitWriter.cpp b/Examples/Io/EDM4hep/src/EDM4hepSimHitWriter.cpp
@@ -24,7 +24,7 @@ namespace ActsExamples {
 
 EDM4hepSimHitWriter::EDM4hepSimHitWriter(
  const EDM4hepSimHitWriter::Config& config, Acts::Logging::Level level)
- : WriterT(config.inputSimHits, "CsvSimHitWriter", level),
+ : WriterT(config.inputSimHits, "EDM4hepSimHitWriter", level),
  m_cfg(config),
  m_writer(config.outputPath) {
  ACTS_VERBOSE("Created output file " << config.outputPath);

diff --git a/Examples/Io/HepMC3/src/HepMC3Writer.cpp b/Examples/Io/HepMC3/src/HepMC3Writer.cpp
@@ -14,7 +14,7 @@ namespace ActsExamples {
 
 HepMC3AsciiWriter::HepMC3AsciiWriter(const Config& config,
  Acts::Logging::Level level)
- : WriterT(config.inputEvents, "HepMC3EventWriter", level), m_cfg(config) {
+ : WriterT(config.inputEvents, "HepMC3AsciiWriter", level), m_cfg(config) {
  if (m_cfg.outputStem.empty()) {
  throw std::invalid_argument("Missing output stem file name");
  }