Skip to content

Conan from within CMake

Jekabs Karklins requested to merge issue_16 into master

Created by: martukas

This uses the solution developed/adapted by @matthew-d-jones to run conan from within CMake. As a result, the conan install ... step can be skipped when building the software. This also means that you can run build steps without doing ./activate_run. However, actually running the software might still require this. daq-in-a-box instructions should be updated, with some testing to confirm this behavior.

As a positive side effect, binary output directories for targets are no longer hijacked by some freaky config we had before. We have redirected the binaries as follows:

  • executables in bin
  • EFU modules in bin/modules
  • unit test executables in unit_tests
  • integration test executables in integration_tests (so far this is only for ADC)

If this is not to someone's liking, we can redirect them wherever else we want. However, this may mean that deployment scripts and daq-in-a-box instructions have to be updated.

Jenkinsfile has been updated, artifact archiving factored out into a function. Tests are built in parallel, using custom target unit_tests but are run sequentially.

Merge request reports

Loading