Merge branch 'FixCmakeConvexParticles' into 'master'

Fixed ordering of cmake commands

See merge request !454
41 jobs for master in 259 minutes and 14 seconds (queued for 9 minutes and 15 seconds)