Merge branch 'meson'

unbelievableflavour · Sep 22, 2018 · 3b7feda · 3b7feda
2 parents 104fbd8 + 53c5b35
commit 3b7feda
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 1,179 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/README.md b/README.md
@@ -37,12 +37,10 @@ These dependencies must be present before building
 
 ### Building
 ```
-mkdir build
+meson build --prefix=/usr
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ../
-make pot
-make
+ninja
 ```
 
 ### Installing
-`sudo make install`
+`sudo ninja install`
diff --git a/cmake/FindGirCompiler.cmake b/cmake/FindGirCompiler.cmake
diff --git a/cmake/FindVala.cmake b/cmake/FindVala.cmake
diff --git a/cmake/GObjectIntrospectionMacros.cmake b/cmake/GObjectIntrospectionMacros.cmake
diff --git a/cmake/GResource.cmake b/cmake/GResource.cmake
diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake