Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1213875

Browse files
committed
meson: Add support for detecting ossp-uuid without pkg-config
This is necessary as ossp-uuid on windows installs neither a pkg-config nor acmake dependency information. Nor is there another supported uuidimplementation available on windows.Reported-by: Dave Page <dpage@pgadmin.org>Reviewed-by: Tristan Partin <tristan@partin.io>Discussion:https://postgr.es/m/20240709065101.xhc74r3mdg2lmn4w@awork3.anarazel.deBackpatch: 16-, where meson support was added
1 parenta850701 commit1213875

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

‎meson.build

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,9 +1386,26 @@ if uuidopt != 'none'
13861386
uuidfunc='uuid_to_string'
13871387
uuidheader='uuid.h'
13881388
elif uuidopt=='ossp'
1389-
uuid=dependency('ossp-uuid',required:true)
1389+
uuid=dependency('ossp-uuid',required:false)
13901390
uuidfunc='uuid_export'
13911391
uuidheader='uuid.h'
1392+
1393+
# Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on
1394+
# windows installs neither a pkg-config nor a cmake dependency
1395+
# information. Nor is there another supported uuid implementation
1396+
# available on windows.
1397+
#
1398+
# Sometimes the ossp-uuid library is named 'uuid' sometimes 'ossp-uuid'
1399+
ifnot uuid.found()
1400+
uuid= cc.find_library('ossp-uuid',
1401+
required:false,dirs: test_lib_d,
1402+
has_headers: uuidheader,header_include_directories: postgres_inc)
1403+
endif
1404+
ifnot uuid.found()
1405+
uuid= cc.find_library('uuid',
1406+
required:true,dirs: test_lib_d,
1407+
has_headers: uuidheader,header_include_directories: postgres_inc)
1408+
endif
13921409
else
13931410
error('unknown uuid build option value: @0@'.format(uuidopt))
13941411
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp