Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use meson build system #75

Merged
merged 6 commits into from
Jul 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ services:
- docker

env:
- DEPENDENCY_PACKAGES="cmake libclutter-gtk-1.0-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libunity-dev valac"
- DEPENDENCY_PACKAGES="meson libclutter-gtk-1.0-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libunity-dev valac"

install:
- docker pull elementary/docker:loki
- docker run -v "$PWD":/tmp/build-dir elementary/docker:loki /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && cmake . && env CTEST_OUTPUT_ON_FAILURE=true make"
- docker pull elementary/docker:loki-unstable
- docker run -v "$PWD":/tmp/build-dir elementary/docker:loki-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && cmake . && env CTEST_OUTPUT_ON_FAILURE=true make"
- docker pull elementary/docker:juno-unstable
- docker run -v "$PWD":/tmp/build-dir elementary/docker:juno-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && meson build --prefix=/usr && cd build && ninja"

script:
- echo BUILDS PASSED
1 change: 0 additions & 1 deletion AUTHORS

This file was deleted.

154 changes: 0 additions & 154 deletions CMakeLists.txt

This file was deleted.

22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,31 @@
# Switchboard
[![Translation status](https://l10n.elementary.io/widgets/switchboard/-/svg-badge.svg)](https://l10n.elementary.io/projects/switchboard/?utm_source=widget)
[![Packaging status](https://repology.org/badge/tiny-repos/switchboard.svg)](https://repology.org/metapackage/switchboard)
[![l10n](https://l10n.elementary.io/widgets/switchboard/-/svg-badge.svg)](https://l10n.elementary.io/projects/switchboard/?utm_source=widget)

![System Settings Screenshot](data/screenshot.png?raw=true)

## Building, Testing, and Installation

You'll need the following dependencies:

* cmake
* debhelper
* libclutter-gtk-1.0-dev
* libgee-0.8-dev
* libglib2.0-dev
* libgranite-dev
* libgtk-3-dev
* libunity-dev
* meson
* valac

It's recommended to create a clean build environment
Run `meson` to configure the build environment and then `ninja` to build

mkdir build
cd build/

Run `cmake` to configure the build environment and then `make` to build
meson build --prefix=/usr
cd build
ninja

cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make

To install, use `make install`, then execute with `switchboard`
To install, use `ninja install` then execute with `switchboard`

sudo make install
sudo ninja install
switchboard

## Making Switchboard Plugins
Expand Down
56 changes: 0 additions & 56 deletions cmake/FindGirCompiler.cmake

This file was deleted.

65 changes: 0 additions & 65 deletions cmake/FindVala.cmake

This file was deleted.

34 changes: 0 additions & 34 deletions cmake/GObjectIntrospectionMacros.cmake

This file was deleted.

Loading