mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 14:42:48 +08:00
[glog] Fix CUDA not working with NVCC compiler. (#28097)
* [glog] Fix CUDA not working with NVCC compiler. * update version * update patch * version
This commit is contained in:
parent
1a6e66e7e4
commit
eaa6e7215d
@ -1,5 +1,5 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d145517..681b791 100644
|
||||
index d145517..e8e1c90 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -669,6 +669,10 @@ if (CYGWIN OR WIN32)
|
||||
@ -7,7 +7,7 @@ index d145517..681b791 100644
|
||||
endif (CYGWIN OR WIN32)
|
||||
|
||||
+if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914))
|
||||
+ target_compile_options(glog INTERFACE "/Zc:__cplusplus")
|
||||
+ target_compile_options(glog INTERFACE "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/Zc:__cplusplus>")
|
||||
+endif()
|
||||
+
|
||||
if (WITH_CUSTOM_PREFIX)
|
||||
|
@ -11,9 +11,11 @@ vcpkg_from_github(
|
||||
fix_cplusplus_macro.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
unwind WITH_UNWIND
|
||||
customprefix WITH_CUSTOM_PREFIX
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
unwind WITH_UNWIND
|
||||
customprefix WITH_CUSTOM_PREFIX
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/glog-modules.cmake.in")
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "glog",
|
||||
"version": "0.6.0",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "C++ implementation of the Google logging module",
|
||||
"homepage": "https://github.com/google/glog",
|
||||
"license": "BSD-3-Clause",
|
||||
|
@ -2674,7 +2674,7 @@
|
||||
},
|
||||
"glog": {
|
||||
"baseline": "0.6.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"gloo": {
|
||||
"baseline": "20201203",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "cce45164ee522a505686c1794e7c228e44f52d76",
|
||||
"version": "0.6.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "1fceaa6733361ea635af35ec1ce9b3caf47e0ffc",
|
||||
"version": "0.6.0",
|
||||
|
Loading…
Reference in New Issue
Block a user