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

Commit793a5be

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 parent2b45933 commit793a5be

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
@@ -1393,9 +1393,26 @@ if uuidopt != 'none'
13931393
uuidfunc='uuid_to_string'
13941394
uuidheader='uuid.h'
13951395
elif uuidopt=='ossp'
1396-
uuid=dependency('ossp-uuid',required:true)
1396+
uuid=dependency('ossp-uuid',required:false)
13971397
uuidfunc='uuid_export'
13981398
uuidheader='uuid.h'
1399+
1400+
# Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on
1401+
# windows installs neither a pkg-config nor a cmake dependency
1402+
# information. Nor is there another supported uuid implementation
1403+
# available on windows.
1404+
#
1405+
# Sometimes the ossp-uuid library is named 'uuid' sometimes 'ossp-uuid'
1406+
ifnot uuid.found()
1407+
uuid= cc.find_library('ossp-uuid',
1408+
required:false,dirs: test_lib_d,
1409+
has_headers: uuidheader,header_include_directories: postgres_inc)
1410+
endif
1411+
ifnot uuid.found()
1412+
uuid= cc.find_library('uuid',
1413+
required:true,dirs: test_lib_d,
1414+
has_headers: uuidheader,header_include_directories: postgres_inc)
1415+
endif
13991416
else
14001417
error('unknown uuid build option value: @0@'.format(uuidopt))
14011418
endif

0 commit comments

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