mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 00:47:50 +08:00
25 lines
1.4 KiB
Diff
25 lines
1.4 KiB
Diff
|
diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
|
||
|
|
index c4a41e6..da46613 100644
|
||
|
|
--- a/CMake/AbseilDll.cmake
|
||
|
|
+++ b/CMake/AbseilDll.cmake
|
||
|
|
@@ -787,7 +787,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
|
||
|
|
# Abseil libraries require C++14 as the current minimum standard. When
|
||
|
|
# compiled with C++17 (either because it is the compiler's default or
|
||
|
|
# explicitly requested), then Abseil requires C++17.
|
||
|
|
- _absl_target_compile_features_if_available(${_NAME} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
|
||
|
|
+ _absl_target_compile_features_if_available(${_dll} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
|
||
|
|
else()
|
||
|
|
# Note: This is legacy (before CMake 3.8) behavior. Setting the
|
||
|
|
# target-level CXX_STANDARD property to ABSL_CXX_STANDARD (which is
|
||
|
|
@@ -797,8 +797,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
|
||
|
|
# CXX_STANDARD_REQUIRED does guard against the top-level CMake project
|
||
|
|
# not having enabled CMAKE_CXX_STANDARD_REQUIRED (which prevents
|
||
|
|
# "decaying" to an older standard if the requested one isn't available).
|
||
|
|
- set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
|
||
|
|
- set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
||
|
|
+ set_property(TARGET ${_dll} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
|
||
|
|
+ set_property(TARGET ${_dll} PROPERTY CXX_STANDARD_REQUIRED ON)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
install(TARGETS ${_dll} EXPORT ${PROJECT_NAME}Targets
|