meson: Add top level meson.build

Author: xclaesse

Makefile

@@ -21,9 +21,8 @@ ENABLE_NVCC :=	true
 ENABLE_CUDA := -Denable_cuda=true -Denable_nvcc=$(ENABLE_NVCC)
 
 # Directories
-LIBVMAF_DIR := libvmaf
-BUILD_DIR := $(LIBVMAF_DIR)/build
-DEBUG_DIR := $(LIBVMAF_DIR)/debug
+BUILD_DIR := builddir
+DEBUG_DIR := builddir-debug
 
 .PHONY: default all debug build install cythonize clean distclean cythonize-deps
 
@@ -32,10 +31,10 @@ default: build
 all: build debug install test cythonize
 
 $(BUILD_DIR): $(MESON) $(NINJA)
-	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(BUILD_DIR) $(LIBVMAF_DIR) $(BUILDTYPE_RELEASE) $(ENABLE_FLOAT) $(ENABLE_CUDA)
+	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(BUILD_DIR) $(BUILDTYPE_RELEASE) $(ENABLE_FLOAT) $(ENABLE_CUDA)
 
 $(DEBUG_DIR): $(MESON) $(NINJA)
-	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(DEBUG_DIR) $(LIBVMAF_DIR) $(BUILDTYPE_DEBUG) $(ENABLE_FLOAT) $(ENABLE_CUDA)
+	PATH="$(VENV)/bin:$$PATH" $(MESON_SETUP) $(DEBUG_DIR) $(BUILDTYPE_DEBUG) $(ENABLE_FLOAT) $(ENABLE_CUDA)
 
 cythonize: cythonize-deps
 	pushd python && ../$(VENV_PYTHON) setup.py build_ext --build-lib . && popd || exit 1
@@ -73,4 +72,4 @@ $(NINJA): $(VENV_PIP)
 	$(VENV_PIP) install ninja || { echo "Failed to install ninja"; exit 1; }
 
 cythonize-deps: $(VENV_PIP)
-	$(VENV_PIP) install setuptools cython numpy || { echo "Failed to install dependencies"; exit 1; }
+	$(VENV_PIP) install setuptools cython numpy || { echo "Failed to install dependencies"; exit 1; }

libvmaf/meson.build

@@ -1,13 +1,3 @@
-project('libvmaf', ['c', 'cpp'],
-    version : '3.0.0',
-    default_options : ['c_std=c11',
-                       'cpp_std=c++11',
-                       'warning_level=2',
-                       'buildtype=release',
-                       'default_library=both',
-                      ],
-    meson_version: '>= 0.56.1')
-
 vmaf_soname_version       = '3.0.0'
 vmaf_api_version_array    = vmaf_soname_version.split('.')
 vmaf_api_version_major    = vmaf_api_version_array[0]

meson.build

@@ -0,0 +1,11 @@
+project('libvmaf', ['c', 'cpp'],
+    version : '3.0.0',
+    default_options : ['c_std=c11',
+                       'cpp_std=c++11',
+                       'warning_level=2',
+                       'buildtype=release',
+                       'default_library=both',
+                      ],
+    meson_version: '>= 0.56.1')
+
+subdir('libvmaf')