mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 01:19:20 +08:00
eaa6e7215d
* [glog] Fix CUDA not working with NVCC compiler. * update version * update patch * version
16 lines
544 B
Diff
16 lines
544 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d145517..e8e1c90 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -669,6 +669,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()
|
|
+
|
|
if (WITH_CUSTOM_PREFIX)
|
|
target_compile_definitions (glog PUBLIC GLOG_CUSTOM_PREFIX_SUPPORT)
|
|
endif (WITH_CUSTOM_PREFIX)
|