Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • W waLBerla
  • Project information
    • Project information
    • Activity
    • Labels
    • Planning hierarchy
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 38
    • Issues 38
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 10
    • Merge requests 10
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • waLBerla
  • waLBerla
  • Merge requests
  • !454

Merged
Created May 17, 2021 by Christoph Rettinger@rettingerOwner

Fixed ordering of cmake commands

  • Overview 0
  • Commits 1
  • Pipelines 1
  • Changes 1

This (apparently) fixes a current issue with the detection of OpenMesh / ConvexPolyhedron shape in mesa_pd:

  • these shapes require OpenMesh but use a separate define WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE
  • this is set here: https://i10git.cs.fau.de/walberla/walberla/-/blob/master/src/mesa_pd/CMakeLists.txt#L10
  • this happened AFTER src/walberlaDefinitions.h -> The corresponding line in this file is not active (i.e., #cmakedefine WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE is still commented)

As a result, executing cmake and then make in a fresh build directory leads to the cmake output that the convex shape is available but, when building, it is not found. This was not noticed in the CI since there we call cmake twice, which also "fixes" this issue.

Hopefully this reordering of the cake commands does not break something else.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: FixCmakeConvexParticles