From fa9238d9a9362e8e9b8a851b4cbdff0f773ad15a Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 8 Jul 2024 22:28:12 -0700 Subject: [PATCH v2 04/10] meson: Add support for detecting ossp-uuid without pkg-config This is necessary as ossp-uuid on windows installs neither a pkg-config nor a cmake dependency information. Nor is there another supported uuid implementation available on windows. Author: Reviewed-by: Discussion: https://postgr.es/m/ Backpatch: --- meson.build | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 9a54b6ea01b..53b61aa4da2 100644 --- a/meson.build +++ b/meson.build @@ -1374,9 +1374,26 @@ if uuidopt != 'none' uuidfunc = 'uuid_to_string' uuidheader = 'uuid.h' elif uuidopt == 'ossp' - uuid = dependency('ossp-uuid', required: true) + uuid = dependency('ossp-uuid', required: false) uuidfunc = 'uuid_export' uuidheader = 'uuid.h' + + # Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on + # windows installs neither a pkg-config nor a cmake dependency + # information. Nor is there another supported uuid implementation + # available on windows. + # + # Sometimes the ossp-uuid library is named 'uuid' sometimes 'ossp-uuid' + if not uuid.found() + uuid = cc.find_library('ossp-uuid', + required: false, dirs: test_lib_d, + has_headers: uuidheader, header_include_directories: postgres_inc) + endif + if not uuid.found() + uuid = cc.find_library('uuid', + required: true, dirs: test_lib_d, + has_headers: uuidheader, header_include_directories: postgres_inc) + endif else error('unknown uuid build option value: @0@'.format(uuidopt)) endif -- 2.44.0.279.g3bd955d269