From d071ff08aeae2bbea4ac4a8e56c7a146c13d0869 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 1 Dec 2017 05:21:03 -0500 Subject: remove the rest of cmake --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 48f8a0cb..b6e56f7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -CMakeCache.txt -CMakeFiles -Makefile -cmake_install.cmake install_manifest.txt *.swp *.o -- cgit v1.2.3 From bb173672ae1677967ebbe39facb432d06dccd884 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 12 Mar 2018 12:21:46 +0100 Subject: meson: allow wlroots to be a subproject --- .gitignore | 1 + meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b6e56f7a..f48e22e5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ build/ .lvimrc config-debug wayland-*-protocol.* +/subprojects/wlroots diff --git a/meson.build b/meson.build index fc995c81..f27ac451 100644 --- a/meson.build +++ b/meson.build @@ -21,7 +21,7 @@ prefix = get_option('prefix') jsonc = dependency('json-c', version: '>=0.13') pcre = dependency('libpcre') -wlroots = dependency('wlroots') +wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots']) wayland_server = dependency('wayland-server') wayland_client = dependency('wayland-client') wayland_egl = dependency('wayland-egl') -- cgit v1.2.3 From 07616c7c247bff0b776c8040718ea143a5c8485f Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 28 Mar 2018 12:22:28 -0400 Subject: Add subprojects to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f48e22e5..1352970b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ build/ config-debug wayland-*-protocol.* /subprojects/wlroots +subprojects -- cgit v1.2.3