mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 05:29:00 +08:00
80150f8687
* Update stduuid to 1.2.3
* Update CI baseline
* Switch back to ${PORT}
* Update CI baseline
---------
Co-authored-by: chausner <chausner@users.noreply.github.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -43,11 +43,11 @@ if (UUID_TIME_GENERATOR)
|
|
endif()
|
|
|
|
# Using span from std
|
|
-if (NOT UUID_USING_CXX20_SPAN)
|
|
- target_include_directories(${PROJECT_NAME} INTERFACE
|
|
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
|
- $<INSTALL_INTERFACE:include>)
|
|
- install(DIRECTORY gsl DESTINATION include)
|
|
+if (UUID_USING_CXX20_SPAN)
|
|
+ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20)
|
|
+else()
|
|
+ find_package(Microsoft.GSL CONFIG REQUIRED)
|
|
+ target_link_libraries(${PROJECT_NAME} INTERFACE Microsoft.GSL::GSL)
|
|
endif ()
|
|
|
|
if(UUID_ENABLE_INSTALL)
|
|
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
|
|
--- a/cmake/Config.cmake.in
|
|
+++ b/cmake/Config.cmake.in
|
|
@@ -9,6 +9,10 @@ if (@UUID_SYSTEM_GENERATOR@)
|
|
endif ()
|
|
endif ()
|
|
|
|
+if (NOT "@UUID_USING_CXX20_SPAN@")
|
|
+ find_dependency(Microsoft.GSL)
|
|
+endif ()
|
|
+
|
|
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")
|
|
|
|
check_required_components(@PROJECT_NAME@)
|
|
\ No newline at end of file
|