Skip to content

Commit 67b0d11

Browse files
committed
build: switch to bundled UUID
Rather than relying on the system UUID, use the bundled UUID on all the targets. There is some work needed to port this to windows, but this should be sufficient for Linux (and FreeBSD).
1 parent e293376 commit 67b0d11

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ option(FOUNDATION_PATH_TO_XCTEST_BUILD "Path to XCTest build" "")
1919
find_package(CURL REQUIRED)
2020
find_package(ICU COMPONENTS uc i18n REQUIRED)
2121
find_package(LibXml2 REQUIRED)
22-
find_package(UUID REQUIRED)
2322

2423
include(SwiftSupport)
2524
include(GNUInstallDirs)
@@ -273,7 +272,7 @@ add_swift_library(Foundation
273272
${ICU_UC_LIBRARY} ${ICU_I18N_LIBRARY}
274273
${LIBXML2_LIBRARIES}
275274
${libdispatch_ldflags}
276-
${uuid_LIBRARIES}
275+
$<TARGET_FILE:uuid>
277276
-Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN"
278277
SWIFT_FLAGS
279278
-DDEPLOYMENT_RUNTIME_SWIFT
@@ -292,8 +291,7 @@ if(NOT BUILD_SHARED_LIBS)
292291
${CURL_LIBRARIES}
293292
${ICU_UC_LIBRARY}
294293
${ICU_I18N_LIBRARY}
295-
${LIBXML2_LIBRARIES}
296-
${uuid_LIBRARIES})
294+
${LIBXML2_LIBRARIES})
297295
endif()
298296

299297
add_swift_executable(plutil

0 commit comments

Comments
 (0)