From fb7dfbafcc1c0bf2425f37aec2c62aac5f9be83c Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 17 Aug 2024 00:34:03 +0000 Subject: [PATCH] Include includedir in .oc file FossilOrigin-Name: 3f21e45c114e4d353153898b1942f2333e69d86bf9eb1df823e5c80a654abdca --- ObjMatrix.oc.in | 1 + meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/ObjMatrix.oc.in b/ObjMatrix.oc.in index b18b0f1..f31b930 100644 --- a/ObjMatrix.oc.in +++ b/ObjMatrix.oc.in @@ -1,6 +1,7 @@ package_format 1 package_depends_on ObjFWTLS package_depends_on ObjSQLite3 +CPPFLAGS="$CPPFLAGS -I@includedir@" LIBS="-L@libdir@ -lobjmatrix $LIBS" FRAMEWORK_LIBS="-L@libdir@ -lobjmatrix $FRAMEWORK_LIBS" STATIC_LIBS="@libdir@/libobjmatrix.a $STATIC_LIBS" diff --git a/meson.build b/meson.build index 1cd3eac..200975f 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,7 @@ configure_file( input: 'ObjMatrix.oc.in', output: 'ObjMatrix.oc', configuration: { + 'includedir': get_option('prefix') / get_option('includedir'), 'libdir': get_option('prefix') / get_option('libdir'), }, install: true,