Skip to content
Snippets Groups Projects

WorkDir CMake 3.15+ Fix, master branch (2020.02.02.)

Merged Attila Krasznahorkay requested to merge akraszna/athena:WorkDirFix-master-20200202 into master
1 unresolved thread

This is a belated update along the same lines as how all the other projects in the repository have recently been updated in !29347 (merged).

Thanks to @christos for pointing this out. (That the WorkDir project no longer works against the latest nightly...) The necessary fixes were relatively minor in the end... Also, it's worth noting that the Fortran support in the WorkDir project has been broken for a loooong time. I guess nobody wanted to develop any Fortran code against a nightly in the last 1-2 years... :confused: (It should be fixed with this.)

This is relatively urgent, as people will start complaining tomorrow morning. :frowning: Also, the CI is completely blind to these updates. So the RC will have to trust me on this... :stuck_out_tongue:

Cc. @abarton, @wlampl, @emoyse, @fwinkl.

Merge request reports

Pipeline #1385211 passed

Pipeline passed for dace9592 on akraszna:WorkDirFix-master-20200202

Merged by Frank WinklmeierFrank Winklmeier 5 years ago (Feb 2, 2020 7:48pm UTC)

Merge details

  • Changes merged into with 40132a3f.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Joerg Stelzer resolved all threads

    resolved all threads

  • 1 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
    1 2 #
    2 3 # Project file for building a selected set of packages against an
    3 4 # installed ATLAS release/nightly.
    4 5 #
    5 6
    6 # Set the minimum required CMake version:
    7 cmake_minimum_required( VERSION 3.6 FATAL_ERROR )
    7 # Set up the project.
    8 cmake_minimum_required( VERSION 3.6 )
    9 project( WorkDir VERSION 1.0.0 LANGUAGES C CXX )
  • :thinking: I was wondering about this... I believe it should be okay to call find_package(...) before the project(...) call. So this should be solvable. Though I wonder if we should make that package rely on something other than ${CMAKE_PROJECT_VERSION}. (Though I don't have a good proposal at this point... :frowning:)

  • Doing the project(...) call after find_package( Athena ) doesn't seem to work. I get some very strange errors with that. But calling it twice (first without version and then with proper version) seems to do the trick. The documentation doesn't say this is supported but the source code explicitly does: https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmProjectCommand.cxx#L61-66

    So maybe we can go with that solution at least for the moment...

  • Frank Winklmeier mentioned in merge request !30035 (merged)

    mentioned in merge request !30035 (merged)

  • It is definitely okay to call project(...) multiple times inside of a software project.

    https://cmake.org/cmake/help/latest/variable/CMAKE_PROJECT_VERSION.html

    But yeah, the description about project(...) is definitely not too obvious about this.

    So okay, this could be good enough for now. But I'll definitely think a bit on how we could do it better. It just seems a bit too much of a hack. (Though for the WorkDir project, being a bit hacky, is not the end of the world...)

  • mentioned in commit 372de00e

  • Please register or sign in to reply
    Loading