always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "cpp: Bump to C++20 on unix platform"

Browse Source 
This reverts commit d7cc0fbd85.
This commit is contained in:
Corentin Le Molgat
2024-01-10 11:06:02 +01:00
parent 3fc81b3cac
commit bd241abe53
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.bazelrc
View File

@@ -17,14 +17,14 @@ build --flag_alias=with_xpress=//ortools/linear_solver:with_xpress
# Sets the default Apple platform to macOS.
build --apple_platform_type=macos
# By default, build OR-Tools in C++ 20 mode, with various extra flags per
# By default, build OR-Tools in C++ 17 mode, with various extra flags per
# platform.
build --enable_platform_specific_config
build:linux --cxxopt="-std=c++20" --cxxopt=-Wno-sign-compare
build:linux --host_cxxopt="-std=c++20" --cxxopt=-Wno-sign-compare
build:macos --cxxopt="-std=c++20" --features=-supports_dynamic_linker --cxxopt=-Wno-sign-compare
build:macos --host_cxxopt="-std=c++20" --features=-supports_dynamic_linker --cxxopt=-Wno-sign-compare
build:linux --cxxopt="-std=c++17" --cxxopt=-Wno-sign-compare
build:linux --host_cxxopt="-std=c++17" --cxxopt=-Wno-sign-compare
build:macos --cxxopt="-std=c++17" --features=-supports_dynamic_linker --cxxopt=-Wno-sign-compare
build:macos --host_cxxopt="-std=c++17" --features=-supports_dynamic_linker --cxxopt=-Wno-sign-compare
build:windows --cxxopt="/std:c++20"
build:windows --host_cxxopt="/std:c++20"

6
CMakeLists.txt
View File

@@ -25,7 +25,11 @@ message(STATUS "${PROJECT_NAME} version: ${PROJECT_VERSION}")
#message(STATUS "minor: ${PROJECT_VERSION_MINOR}")
#message(STATUS "patch: ${PROJECT_VERSION_PATCH}")
set(CMAKE_CXX_STANDARD 20)
if(MSVC)
set(CMAKE_CXX_STANDARD 20)
else()
set(CMAKE_CXX_STANDARD 17)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

6
cmake/dependencies/CMakeLists.txt
View File

@@ -343,7 +343,11 @@ if(BUILD_Cbc)
message(CHECK_PASS "fetched")
endif()
set(CMAKE_CXX_STANDARD 20)
if(MSVC)
set(CMAKE_CXX_STANDARD 20)
else()
set(CMAKE_CXX_STANDARD 17)
endif()
###############
## TESTING ##

6
ortools/cpp/CMakeLists.txt.in
View File

@@ -9,7 +9,11 @@ message(STATUS "${PROJECT_NAME} version: ${PROJECT_VERSION}")
#message(STATUS "minor: ${PROJECT_VERSION_MINOR}")
#message(STATUS "patch: ${PROJECT_VERSION_PATCH}")
set(CMAKE_CXX_STANDARD 20)
if(MSVC)
set(CMAKE_CXX_STANDARD 20)
else()
set(CMAKE_CXX_STANDARD 17)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)