mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 01:49:02 +08:00
683c1dfd2d
- [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md) - [X] SHA512s are updated for each updated download - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file.
16 lines
544 B
Diff
16 lines
544 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 985f5f5..bf6600e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -476,6 +476,10 @@ if (CYGWIN OR WIN32)
|
|
target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES)
|
|
endif (CYGWIN OR WIN32)
|
|
|
|
+if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914))
|
|
+ target_compile_options(glog INTERFACE "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/Zc:__cplusplus>")
|
|
+endif()
|
|
+
|
|
set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}")
|
|
|
|
target_include_directories (glog BEFORE PUBLIC
|