Skip to content

Commit ea97e8d

Browse files
authored
Support for alternative stdlib on a private platform (#181)
1 parent 4920887 commit ea97e8d

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ include(cmake/linkerFlags.cmake)
9090
include(GNUInstallDirs)
9191
include(FetchContent)
9292

93-
set(CMAKE_CXX_STANDARD 17)
93+
if (NOT CMAKE_CXX_STANDARD)
94+
set(CMAKE_CXX_STANDARD 17)
95+
endif()
9496
option(LOGS_ENABLED "Enable log output" ON)
9597

9698
if(NOT MSVC)

submodules/private

vcpkg.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@
5656
}
5757
],
5858
"supports": "android"
59+
},
60+
"stdlibv2" : {
61+
"description": "Enabled programmatically when needed, do not set yourself",
62+
"dependencies": [
63+
{
64+
"name": "protobuf",
65+
"features": ["stdlibv2"]
66+
}
67+
]
5968
}
6069
},
6170
"overrides": [{ "name": "protobuf", "version": "3.21.12", "port-version": 4 }]

0 commit comments

Comments
 (0)