mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 19:27:50 +08:00
88dd0e7ddd
* [libuuid]Add warning to non-unix platform when building. * [azure-storage-cpp] Don't rely on vcpkg install of libuuid on OSX in favor of the built in version * [azure-storage-cpp] Remove old patch
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
|
|
index 9171f8c..b2c7b93 100644
|
|
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
|
|
+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
|
|
@@ -13,6 +13,11 @@
|
|
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
#
|
|
|
|
+if (APPLE)
|
|
+ set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/)
|
|
+ set(CMAKE_OSX_FRAMEWORK_HEADERS ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers)
|
|
+ set(UUID_LIBRARY "")
|
|
+endif()
|
|
|
|
if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
|
# in cache already
|
|
@@ -39,6 +44,7 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
|
/opt/include
|
|
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
|
|
/usr/freeware/include
|
|
+ ${CMAKE_OSX_FRAMEWORK_HEADERS}
|
|
)
|
|
|
|
find_library(UUID_LIBRARY
|
|
@@ -88,13 +94,13 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
|
set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
|
|
set(UUID_LIBRARIES ${UUID_LIBRARY})
|
|
|
|
- if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
|
|
+ if (UUID_INCLUDE_DIRS AND (UUID_LIBRARIES OR APPLE))
|
|
set(UUID_FOUND TRUE)
|
|
endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
|
|
|
|
if (UUID_FOUND)
|
|
if (NOT UUID_FIND_QUIETLY)
|
|
- message(STATUS "Found UUID : ${UUID_LIBRARIES}")
|
|
+ message(STATUS "Found UUID : ${UUID_INCLUDE_DIRS} ${UUID_LIBRARIES}")
|
|
endif (NOT UUID_FIND_QUIETLY)
|
|
else (UUID_FOUND)
|
|
if (UUID_FIND_REQUIRED)
|