Skip to content
Snippets Groups Projects

Resolve "EXTERN: Adapt to Conan 2"

Merged Joscha Schmiedt requested to merge f-73-extern-adapt-to-conan-2-0 into dev
All threads resolved!

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 or build/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

Pipeline #53735 passed

Pipeline: caosdb-cppinttest

#53737

    Pipeline: CaosDB Octave library

    #53740

      Pipeline: caosdb-julialib

      #53741

        Pipeline passed for 90dd774a on f-73-extern-adapt-to-conan-2-0

        Approval is optional

        Merged by Florian SpreckelsenFlorian Spreckelsen 11 months ago (Aug 6, 2024 12:00pm UTC)

        Merge details

        • Changes merged into dev with 693f6b48.
        • Deleted the source branch.

        Pipeline #54256 passed

        Pipeline: caosdb-cppinttest

        #54262

          Pipeline: CaosDB Octave library

          #54267

            Pipeline: caosdb-julialib

            #54268

              Pipeline passed for 693f6b48 on dev

              Activity

              Filter activity
              • Approvals
              • Assignees & reviewers
              • Comments (from bots)
              • Comments (from users)
              • Commits & branches
              • Edits
              • Labels
              • Lock status
              • Mentions
              • Merge request status
              • Tracking
            • Joscha Schmiedt marked the checklist item Reference related issues as completed

              marked the checklist item Reference related issues as completed

            • Joscha Schmiedt added 1 commit

              added 1 commit

              • 8b399d78 - Add conan profile detection to docs CI/CD pipeline

              Compare with previous version

            • mentioned in issue #80 (closed)

            • Joscha Schmiedt changed the description

              changed the description

            • Joscha Schmiedt changed the description

              changed the description

            • Joscha Schmiedt added 2 commits

              added 2 commits

              • b7d2dc5e - DOC: Update build instructions for Conan 2.0
              • 526ba9ab - WIP: Adapt test_package for Conan 2.0

              Compare with previous version

            • Joscha Schmiedt added 1 commit

              added 1 commit

              • 9f2cfa2f - WIP: towards fixing conan create

              Compare with previous version

            • Joscha Schmiedt added 10 commits

              added 10 commits

              Compare with previous version

            • added 2 commits

              • ba198faf - Fix issue with setuptools >= 71
              • 11325c25 - Merge branch 'f-73-extern-adapt-to-conan-2-0' of...

              Compare with previous version

            • Joscha Schmiedt changed the description

              changed the description

            • Joscha Schmiedt changed title from Resolve "EXTERN: Adapt to Conan 2.0" to Resolve "EXTERN: Adapt to Conan 2"

              changed title from Resolve "EXTERN: Adapt to Conan 2.0" to Resolve "EXTERN: Adapt to Conan 2"

            • Joscha Schmiedt changed the description

              changed the description

            • added 1 commit

              • b6c6669e - FIX: Update make doc for Conan 2

              Compare with previous version

            • added 2 commits

              • fc96026e - Update CHANGELOG.md
              • 982cb0eb - Add Daniel, Joscha and Florian to HUMANS.md

              Compare with previous version

            • Joscha Schmiedt marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

              marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

            • Joscha Schmiedt marked the checklist item Up-to-date JSON schema (or not necessary) as completed

              marked the checklist item Up-to-date JSON schema (or not necessary) as completed

            • Joscha Schmiedt marked the checklist item Annotations in code (Gitlab comments) as completed

              marked the checklist item Annotations in code (Gitlab comments) as completed

            • Joscha Schmiedt marked the checklist item Appropriate user and developer documentation (or not necessary) as completed

              marked the checklist item Appropriate user and developer documentation (or not necessary) as completed

            • added 1 commit

              • 9cdeb0a6 - PIPELINE: Broken path to docs

              Compare with previous version

            • Joscha Schmiedt marked the checklist item All automated tests pass as completed

              marked the checklist item All automated tests pass as completed

            • Joscha Schmiedt changed the description

              changed the description

            • mentioned in issue #84 (closed)

            • Joscha Schmiedt resolved all threads

              resolved all threads

            • requested review from @florian

            • added 1 commit

              • 2a5c24a9 - FIX: Remove personal folder from make doc

              Compare with previous version

            • added 1 commit

              • 90dd774a - FIX: Wrong build instructions for manual unit tests

              Compare with previous version

            • Florian Spreckelsen resolved all threads

              resolved all threads

            • Florian Spreckelsen marked the checklist item I understand the intent of this MR as completed

              marked the checklist item I understand the intent of this MR as completed

            • Florian Spreckelsen marked the checklist item All automated tests pass as completed

              marked the checklist item All automated tests pass as completed

            • Florian Spreckelsen marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

              marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

            • Florian Spreckelsen marked the checklist item Appropriate user and developer documentation (or not necessary) as completed

              marked the checklist item Appropriate user and developer documentation (or not necessary) as completed

            • Florian Spreckelsen marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as completed

              marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as completed

            • Florian Spreckelsen marked the checklist item In-code documentation and comments are up-to-date. as completed

              marked the checklist item In-code documentation and comments are up-to-date. as completed

            • mentioned in commit 693f6b48

            • Please register or sign in to reply
              Loading