ObjPgSQL  Check-in [7c54d67cf3]

Overview
Comment:Include includedir in .oc file
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA3-256: 7c54d67cf30ec374b8f855873ce30d488dd86160bc366ff2c44f3dacf18e00ca
User & Date: js 2024-08-17 00:33:22
Context
2024-08-17
00:33
Include includedir in .oc file Leaf check-in: 7c54d67cf3 user: js tags: trunk
2024-08-11
18:01
Set version to 1.0 check-in: 33735ae0cd user: js tags: trunk, 1.0-release
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ObjPgSQL.oc.in. 

1
2
3
4
5

package_format 1
CPPFLAGS="$CPPFLAGS @LIBPQ_CPPFLAGS@"
LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS"
FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS"
STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS"


|




1
2
3
4
5

package_format 1
CPPFLAGS="$CPPFLAGS -I@includedir@ @LIBPQ_CPPFLAGS@"
LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS"
FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS"
STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS"

Changes to meson.build.

︙︙
27
28
29
30
31
32
33

34
35
36
37
38
39

  [objfwconfig, '--packages-dir'],
  check: true).stdout().strip()

configure_file(
  input: 'ObjPgSQL.oc.in',
  output: 'ObjPgSQL.oc',
  configuration: {

    'libdir': get_option('prefix') / get_option('libdir'),
    'LIBPQ_CPPFLAGS': libpq_cflags,
    'LIBPQ_LIBS': libpq_libs,
  },
  install: true,
  install_dir: packages_dir)








>







27
28
29
30
31
32
33
34
35
36
37
38
39
40

  [objfwconfig, '--packages-dir'],
  check: true).stdout().strip()

configure_file(
  input: 'ObjPgSQL.oc.in',
  output: 'ObjPgSQL.oc',
  configuration: {
    'includedir': get_option('prefix') / get_option('includedir'),
    'libdir': get_option('prefix') / get_option('libdir'),
    'LIBPQ_CPPFLAGS': libpq_cflags,
    'LIBPQ_LIBS': libpq_libs,
  },
  install: true,
  install_dir: packages_dir)