Skip to content

Commit

Permalink
CircleCI: support Qt from a PPA on /opt
Browse files Browse the repository at this point in the history
  • Loading branch information
@PhysSong
PhysSong authored Oct 31, 2019
1 parent 9cb1f8e commit 488c4ea
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ jobs:
- *restore_cache
- run:
name: Configure
command: mkdir build && cd build && cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
command: |
source /opt/qt5*/bin/qt5*-env.sh || true
mkdir build && cd build
cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
- run:
name: Build
command: cd build && make
Expand Down

2 comments on commit 488c4ea

@lukas-w
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could have just merged #5156 instead of this and 9cb1f8e.

@PhysSong
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen the relevant commit in #5156, but I forgot that at the point I pushed those commits. However, this works regardless of the Qt version of the Docker image(both distro-provided and PPA-provided).

Please sign in to comment.