mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:27:51 +08:00
b13e043b70
The `uuid/uuid.h` header conflicts with system libraries on osx; some system headers include `<uuid/uuid.h>`, intending to get the macOS system headers.
29 lines
811 B
Diff
29 lines
811 B
Diff
diff --git a/cmake_modules/FindUUID.cmake b/cmake_modules/FindUUID.cmake
|
|
index 31bad4c..2532829 100755
|
|
--- a/cmake_modules/FindUUID.cmake
|
|
+++ b/cmake_modules/FindUUID.cmake
|
|
@@ -76,18 +76,18 @@ else(UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
|
/opt/lib
|
|
/usr/freeware/lib64)
|
|
|
|
- if(NOT UUID_LIBRARY AND BSD)
|
|
+ if(NOT UUID_LIBRARY AND (BSD OR APPLE))
|
|
set(UUID_LIBRARY "")
|
|
- endif(NOT UUID_LIBRARY AND BSD)
|
|
+ endif()
|
|
|
|
set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
|
|
set(UUID_LIBRARIES ${UUID_LIBRARY})
|
|
|
|
if(UUID_INCLUDE_DIRS)
|
|
- if(BSD OR UUID_LIBRARIES)
|
|
+ if((BSD OR APPLE) OR UUID_LIBRARIES)
|
|
set(UUID_FOUND TRUE)
|
|
- endif(BSD OR UUID_LIBRARIES)
|
|
- endif(UUID_INCLUDE_DIRS)
|
|
+ endif()
|
|
+ endif()
|
|
|
|
if(UUID_FOUND)
|
|
if(NOT UUID_FIND_QUIETLY)
|