Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • engine engine
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 6
    • Issues 6
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 5
    • Merge requests 5
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Pulse Physiology SuitePulse Physiology Suite
  • engineengine
  • Merge requests
  • !63

Fix use of protobuf from build

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Matthew Woehlke requested to merge fix-protobuf-use into 3.x Sep 04, 2020
  • Overview 7
  • Commits 1
  • Pipelines 0
  • Changes 3

Use different input files to generate the CMake package configuration for the build tree and the install tree. This avoids the build tree trying to refer to our installed copy of protobuf which won't exist if we haven't been installed. This does require a full copy of protobuf (as opposed to just the libraries) when we are used from the build tree, but since we needed that to build, it ought to be available.

Also, fix a small issue in how we check whether we need to use our internal copy of protobuf.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: fix-protobuf-use