Skip to content
Snippets Groups Projects

CMake: Improvements from kitware

Merged Mathieu Westphal requested to merge b383306/libcdi:kitware_cmake_fixes into develop
1 unresolved thread
  • Add multiple CMake option to control which parts of CDI should be built
  • Add installation of the cdilib and associated CMake config file
  • Fix some issues with linking
  • Fix some issues in cdi-config.cmake

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Mathieu Westphal added 5 commits

    added 5 commits

    • 620222c7 - CMake: Add proper support for optional linking to netcdf and eccodes
    • 334ef7d1 - CMake: Install cdilib, headers and CMake config files
    • ed1c5550 - CMake: Fix cdi-config.cmake for CMake compatibility
    • 2b84caae - CMake: Add option to control building the app and the tests
    • f5bbd8eb - CMake: Add control for disabling cdi unknown sources

    Compare with previous version

  • Author Contributor

    please review and merge @m214003 @m300433

  • Mathieu Westphal mentioned in merge request !135 (merged)

    mentioned in merge request !135 (merged)

  • Mathieu Westphal added 17 commits

    added 17 commits

    • f5bbd8eb...ff8e438e - 12 commits from branch mpim-sw:develop
    • 5161ce74 - CMake: Add proper support for optional linking to netcdf and eccodes
    • de26488d - CMake: Install cdilib, headers and CMake config files
    • efa28546 - CMake: Fix cdi-config.cmake for CMake compatibility
    • c386857a - CMake: Add option to control building the app and the tests
    • 1b339c2d - CMake: Add control for disabling cdi unknown sources

    Compare with previous version

    • Author Contributor

      I've rebased my changes. Lets move this forward if possible. Please note I will not be available from this afternoon to march 12.

    • We will probably merge this today. But I cannot promise that we wont change the interface until march. CMake support is not yet official and we are (as you have seen) not at a state where this should be officially released/supported. We plan to have the name to be CDI for example. The app will be another name. But that is yet to be fully decided. Other changes will follow. Does Paraview have a CI that we can check to see if we break something?

    • Author Contributor

      Hi @m300433 !

      Great! No worries, make any changes needed, I will base my work on the next release once it is dropped.

      Do you know when the release will happen ?

      Does Paraview have a CI that we can check to see if we break something?

      ParaView does have a CI however we test your release, not your development branch. Do not worry about it, I'll adjust our build system once you release and upstream any patches if not are needed.

      Best,

    • Release should be very soon. As far as I know a new release should be ready once we got your changes merged.

    • Author Contributor

      Perfect, the archive that will be provided on https://code.mpimet.mpg.de/projects/cdi/files will contain the CMake logic, right ?

      Edited by Mathieu Westphal
    • @m214003 ? Uwe does the packaging. I have no idea. But since this would be the very first time that we smuggle the CMake logic into a release I would expect hiccups. If your hadn't been interested, the first time would have been in a year or so. As far as I know at least. Another topic. I am playing with the thought of taking 2 weeks off in march. The week after the 12th of March was my intended starting point. So It could be that am away until April.

      Edited by Oliver Heidmann
    • Please register or sign in to reply
  • Mathieu Westphal added 5 commits

    added 5 commits

    • 62b32dce - CMake: Add proper support for optional linking to netcdf and eccodes
    • 95f4b01a - CMake: Install cdilib, headers and CMake config files
    • 36f9e72b - CMake: Fix cdi-config.cmake for CMake compatibility
    • d6391b75 - CMake: Add option to control building the app and the tests
    • 9ac79595 - CMake: Add control for disabling cdi unknown sources

    Compare with previous version

  • Oliver Heidmann approved this merge request

    approved this merge request

  • Oliver Heidmann requested review from @m214003

    requested review from @m214003

  • assigned to @m300433

  • Oliver Heidmann assigned to @b383306 and unassigned @m300433

    assigned to @b383306 and unassigned @m300433

  • Uwe Schulzweida approved this merge request

    approved this merge request

  • Please register or sign in to reply
    Loading