diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-08-21 19:56:51 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-08-21 20:00:00 +0200 |
| commit | 206675a3b1495dd03067d764a5a97819e572b558 (patch) | |
| tree | e29d99931c6c425077bd6e0725e0cb0c26c9dda9 /.gitlab-ci.yml | |
| parent | 9ba4cd06dc28d63537c6412200bfe0dee4540f39 (diff) | |
Fix examples build (configure/make)
Fix more issues caused by moving fltk-versions from examples to test
and adding examples to the CMake build process (gitlab-ci)
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23794513d..2c339f508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ build-autotools: # install the necessary build tools before_script: - apt update && apt -y install make autoconf man - - apt -y install freeglut3-dev libfontconfig-dev libxft-dev + - apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev - apt -y install libxcursor-dev libxinerama-dev libasound2-dev - apt -y install libpango1.0-dev libcairo2-dev script: @@ -47,7 +47,7 @@ build-autotools: - test/cairo_test - test/glpuzzle - test/unittests - - examples/fltk-versions + - test/fltk-versions # Build with CMake and Ninja (default configuration) @@ -56,11 +56,11 @@ build-cmake: # install the necessary build tools before_script: - apt update && apt -y install cmake ninja-build - - apt -y install freeglut3-dev libfontconfig-dev libxft-dev + - apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev - apt -y install libxcursor-dev libxinerama-dev libasound2-dev script: - mkdir build && cd build - - cmake -DCMAKE_BUILD_TYPE=Debug -G Ninja .. + - cmake -DCMAKE_BUILD_TYPE=Debug -DFLTK_BUILD_EXAMPLES=ON -G Ninja .. - time ninja artifacts: paths: |