Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • sac2c sac2c
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 394
    • Issues 394
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 25
    • Merge requests 25
  • Deployments
    • Deployments
    • Releases
  • Wiki
    • Wiki
  • External wiki
    • External wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • sac-group
  • sac2csac2c
  • Merge requests
  • !88

Two fixes for masterrun (gtest switch and incorrect CI stage inheritance)

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Hans-Nikolai Viessmann requested to merge hans/sac2c:fix-gtest-ci-build into develop Nov 10, 2018
  • Overview 12
  • Commits 3
  • Changes 7

This MR provides two (actually three) things (yes I know I should have made two (or three?) MRs, but one of them is really small 😃).

  1. one of the CI stages had incorrectly inherited properties from another stage, duplicating work. Specifically when we package, we would try to build a release and weekly package for CentOS 6.
  2. We've integrated the building/linking of GTest now into the build system. The main reason for doing this is that OS packages for gtest are inconsistently packaged and compiled. Some distributions only packages sources, so one needs to compile it anyway; some distributions package it as a shared-lib, but then we get weird linking problems because of missing flags or lib-dependencies. Integrating these flags for specific systems is a waste of time.

Regarding the GTest integration, we only config/compile it when -DFUNCTESTS=ON. GTest is retrieved/compiled/linked through CMake's ExternalProject macro - which means all of this process is automated and cached. We also now consistently use the same version of GTest on all systems.

P.s. CMake has nice integration/support for GTest, but exposing most of this means moving to a newer version of CMake. We now only support CMake/CPack/CTest version >= 3.10.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: fix-gtest-ci-build