Resolve "EXTERN: Adapt to Conan 2"
-
Review changes -
Open in Workspace
-
-
Download -
Patches
-
Plain diff
Summary
Updating from Conan 1 to Conan 2.5 required several changes, both on the conanfile.py
as well as the CMakeLists.txt
file(s).
Related to
Related MR for integration tests: caosdb-cppinttest!35 (merged)
Focus
The biggest changes are in conanfile.py
and CMakeLists.txt
all according to the migration guide. Crucial here are
- Conan now doesn't appear in the
CMakeLists.txt
files anymore. Instead, Conan generates CMakeToolChain files, which handle all the necessary includes etc. The toolchain files are passed to CMake as arguments. - Packages are included in our CMakeLists.txt using CMake's
FindPackage
- Conan 2.0 builds into
build/<build_type>
, i.e.build/Release
orbuild/Debug
Test Environment
How to set up a test environment for manual testing?
Check List for the Author
Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines
-
All automated tests pass -
Reference related issues -
Up-to-date CHANGELOG.md (or not necessary) -
Up-to-date JSON schema (or not necessary) -
Appropriate user and developer documentation (or not necessary) - How do I use the software? Assume "stupid" users.
- How do I develop or debug the software? Assume novice developers.
-
Annotations in code (Gitlab comments) - Intent of new code
- Problems with old code
- Why this implementation?
Check List for the Reviewer
-
I understand the intent of this MR -
All automated tests pass -
Up-to-date CHANGELOG.md (or not necessary) -
Appropriate user and developer documentation (or not necessary) -
The test environment setup works and the intended behavior is reproducible in the test environment -
In-code documentation and comments are up-to-date. -
Check: Are there specifications? Are they satisfied?
For further good practices have a look at our review guidelines.
Edited by Florian Spreckelsen
Merge request reports
Compare and
Show latest version
- version 172a5c24a9
- version 169cdeb0a6
- version 15982cb0eb
- version 14b6c6669e
- version 1311325c25
- version 12686229df
- version 119f2cfa2f
- version 10526ba9ab
- version 98b399d78
- version 8bccf6187
- version 7e3eedae6
- version 6a396b035
- version 5f5883731
- version 4b740e836
- version 381f57ea4
- version 242a61aef
- version 147acdfd8
- dev (base)
- latest version90dd774a33 commits,
- version 172a5c24a932 commits,
- version 169cdeb0a631 commits,
- version 15982cb0eb30 commits,
- version 14b6c6669e28 commits,
- version 1311325c2527 commits,
- version 12686229df25 commits,
- version 119f2cfa2f24 commits,
- version 10526ba9ab23 commits,
- version 98b399d7821 commits,
- version 8bccf618720 commits,
- version 7e3eedae619 commits,
- version 6a396b03518 commits,
- version 5f588373115 commits,
- version 4b740e83611 commits,
- version 381f57ea46 commits,
- version 242a61aef3 commits,
- version 147acdfd81 commit,
Compare changes
- Side-by-side
- Inline
Files
2Loading