Skip to content

Commit

Permalink
Switch to Meson (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
Corentin Noël authored and codygarver committed Feb 22, 2018
1 parent 96c418a commit ade6bb1
Show file tree
Hide file tree
Showing 44 changed files with 455 additions and 1,230 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ services:
- docker

env:
- DEPENDENCY_PACKAGES="cmake dh-systemd libaccountsservice-dev libglib2.0-dev libgranite-dev libgtk-3-dev libpolkit-gobject-1-dev libswitchboard-2.0-dev valac"
- DEPENDENCY_PACKAGES="dh-systemd libaccountsservice-dev libglib2.0-dev libgranite-dev libgtk-3-dev libpolkit-gobject-1-dev libswitchboard-2.0-dev libdbus-1-dev meson 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 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 && meson build --prefix=/usr && cd build && ninja"
- 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 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 && rm -rf build && meson build --prefix=/usr && cd build && ninja"

script:
- echo BUILDS PASSED
4 changes: 0 additions & 4 deletions AUTHORS

This file was deleted.

49 changes: 0 additions & 49 deletions CMakeLists.txt

This file was deleted.

25 changes: 11 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
# Switchboard Parental Controls Plug
[![Translation status](https://l10n.elementary.io/widgets/switchboard/switchboard-plug-parental-controls/svg-badge.svg)](https://l10n.elementary.io/projects/switchboard/switchboard-plug-parental-controls/?utm_source=widget)
[![l10n](https://l10n.elementary.io/widgets/switchboard/switchboard-plug-parental-controls/svg-badge.svg)](https://l10n.elementary.io/projects/switchboard/switchboard-plug-parental-controls)

## Building, Testing, and Installation
## Building and Installation

You'll need the following dependencies:
* cmake

* libaccountsservice-dev
* libdbus-1-dev
* libglib2.0-dev
* libgranite-dev
* libpolkit-gobject-1-dev
* libswitchboard-2.0-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`

sudo make install
switchboard
sudo ninja install
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.

42 changes: 0 additions & 42 deletions cmake/GSettings.cmake

This file was deleted.

36 changes: 0 additions & 36 deletions cmake/ParseArguments.cmake

This file was deleted.

10 changes: 0 additions & 10 deletions cmake/README

This file was deleted.

Loading

0 comments on commit ade6bb1

Please sign in to comment.