Merge branch 'main' of github.com:google/or-tools

google · Aug 3, 2023 · 7d5bfe5 · 7d5bfe5
2 parents 8d44f5f + 4d0fad2
commit 7d5bfe5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,8 +84,13 @@ else()
   endforeach()
 endif()
 
-if(BUILD_SHARED_LIBS AND MSVC)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+if(MSVC)
+  if(NOT BUILD_SHARED_LIBS)
+    # With CMake 3.27+ ZERO_CHECK target will create a cyclic dependencies error.
+    set(CMAKE_SUPPRESS_REGENERATION TRUE)
+  else()
+    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+  endif()
 endif()
 
 # Disable CTest targets

diff --git a/makefiles/Makefile.port.mk b/makefiles/Makefile.port.mk
@@ -17,11 +17,11 @@ BACKSLASH_SPACE := $(empty)\ $(empty)
 
 # Let's discover something about where we run
 ifeq ($(OS),Windows_NT)
-OS = Windows
+OS := Windows
 endif
 ifeq ($(OS),Windows)
-  PLATFORM=WIN64
-  SHELL = cmd.exe
+  PLATFORM := WIN64
+  SHELL := cmd.exe
 endif
 
 # Unix specific part.
@@ -164,7 +164,7 @@ ifneq ($(PLATFORM),WIN64)
 else # Windows specific part.
   # Check 64 bit.
   ifneq ("$(Platform)","x64")  # Visual Studio 2019/2022 64 bit
-    $(warning "Only 64 bit compilation is supported")
+    $(error "Only 64 bit compilation is supported")
   else
     CPU = x64
   endif

diff --git a/tools/release/build_delivery_linux.sh b/tools/release/build_delivery_linux.sh
@@ -207,12 +207,12 @@ function build_python() {
   echo "check python3..."
   command -v python3 | xargs echo "python3: " | tee -a build.log
   python3 -c "import distutils.util as u; print(u.get_platform())" | tee -a build.log
-  python3 -m pip install --upgrade --user pip
-  python3 -m pip install --upgrade --user wheel absl-py mypy-protobuf virtualenv
+  python3 -m pip install --upgrade --user --break-system-package pip
+  python3 -m pip install --upgrade --user --break-system-package wheel absl-py mypy-protobuf virtualenv
   echo "check protoc-gen-mypy..."
   command -v protoc-gen-mypy | xargs echo "protoc-gen-mypy: " | tee -a build.log
   protoc-gen-mypy --version | xargs echo "protoc-gen-mypy version: " | tee -a build.log
-  protoc-gen-mypy --version | grep "3\.2\.0"
+  protoc-gen-mypy --version | grep "3\.5\.0"
 
   # Clean and build
   echo -n "Cleaning Python 3..." | tee -a build.log

diff --git a/tools/release/build_delivery_macos.sh b/tools/release/build_delivery_macos.sh
@@ -235,7 +235,7 @@ function build_python() {
     echo "check protoc-gen-mypy..."
     command -v protoc-gen-mypy | xargs echo "protoc-gen-mypy: " | tee -a build.log
     protoc-gen-mypy --version | xargs echo "protoc-gen-mypy version: " | tee -a build.log
-    protoc-gen-mypy --version | grep "3\.4\.0"
+    protoc-gen-mypy --version | grep "3\.5\.0"
   done
 
   for PY_VERSION in "${PY[@]}"; do