From d6a2696f76659b3f40e9612242de831aad4bea27 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 29 Aug 2022 13:10:38 +0200 Subject: [PATCH] cmake: Fix sat build on windows --- ortools/sat/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ortools/sat/CMakeLists.txt b/ortools/sat/CMakeLists.txt index 506091c58a..4d180d7a51 100644 --- a/ortools/sat/CMakeLists.txt +++ b/ortools/sat/CMakeLists.txt @@ -10,6 +10,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +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) file(GLOB _SRCS "*.h" "*.cc") set(NAME ${PROJECT_NAME}_sat) @@ -18,9 +25,6 @@ set(NAME ${PROJECT_NAME}_sat) #add_library(${NAME} STATIC ${_SRCS}) add_library(${NAME} OBJECT ${_SRCS}) set_target_properties(${NAME} PROPERTIES - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED ON - CXX_EXTENSIONS OFF POSITION_INDEPENDENT_CODE ON ) target_include_directories(${NAME} PRIVATE