Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump CMAKE_CXX_STANDARD as 17 globally #5612

Merged
merged 11 commits into from
Oct 26, 2023
Merged

Bump CMAKE_CXX_STANDARD as 17 globally #5612

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a99cba3
Bump CMAKE_CXX_STANDARD as 17 globally for consistency
jcwchen Sep 21, 2023
e95a6d8
set 17 globally
jcwchen Sep 21, 2023
23397d5
update readme accordingly
jcwchen Sep 21, 2023
f93be93
Merge branch 'main' into jcw/bump-c-17
jcwchen Sep 22, 2023
38323d9
nit
jcwchen Sep 22, 2023
0393d33
Merge branch 'jcw/bump-c-17' of https://github.com/jcwchen/onnx into …
jcwchen Sep 22, 2023
06eefeb
Merge branch 'main' into jcw/bump-c-17
xadupre Oct 2, 2023
92d32af
Merge branch 'main' into jcw/bump-c-17
xadupre Oct 6, 2023
c3fe91e
Merge branch 'main' into jcw/bump-c-17
gramalingam Oct 18, 2023
e8faee8
Merge branch 'main' into jcw/bump-c-17
jcwchen Oct 19, 2023
a1c07ad
Merge branch 'main' into jcw/bump-c-17
jcwchen Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,8 @@ else()
set(Protobuf_USE_STATIC_LIBS ON)
endif()

# Required to use C++17 or higher on Windows
# For other platforms, set C++14 as standard for the whole project
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()
if(MSVC AND CMAKE_CXX_STANDARD LESS 17)
set(CMAKE_CXX_STANDARD 17)
justinchuby marked this conversation as resolved.
Show resolved Hide resolved
elseif(CMAKE_CXX_STANDARD LESS 14)
set(CMAKE_CXX_STANDARD 14)
endif()

include(GNUInstallDirs)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ conda install -c conda-forge onnx

Before building from source uninstall any existing versions of onnx `pip uninstall onnx`.

c++17 or higher C++ compiler version is required to build ONNX from source on Windows. For other platforms, please use C++14 or higher versions.
c++17 or higher C++ compiler version is required to build ONNX from source. Still, users can specify their own `CMAKE_CXX_STANDARD` version for building ONNX.

If you don't have protobuf installed, ONNX will internally download and build protobuf for ONNX build.

Expand Down