cmake: fix model_build_helper.pyi on windows (#4512)

google · Jan 24, 2025 · 09be9a9 · 09be9a9
1 parent e4b5fa5
commit 09be9a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmake/python.cmake b/cmake/python.cmake
@@ -550,8 +550,9 @@ add_custom_command(
     ${PYTHON_PROJECT}/.libs
 
   COMMAND ${CMAKE_COMMAND} -E
-    $<IF:${need_unix_re2_lib},copy,true>
+    $<IF:$<BOOL:${BUILD_re2}>,copy,true>
     $<${need_unix_re2_lib}:$<TARGET_SONAME_FILE:re2::re2>>
+    $<${need_windows_re2_lib}:$<TARGET_FILE:re2::re2>>
     ${PYTHON_PROJECT}/.libs
 
   COMMAND ${CMAKE_COMMAND} -E

diff --git a/ortools/python/__init__.py.in b/ortools/python/__init__.py.in
@@ -55,7 +55,7 @@ def _load_ortools_libs():
         except:
             pass
         else:
-            for dll in ["zlib1.dll", "abseil_dll.dll", "utf8_validity.dll", "libprotobuf.dll", "highs.dll"]:
+            for dll in ["zlib1.dll", "abseil_dll.dll", "utf8_validity.dll", "re2.dll", "libprotobuf.dll", "highs.dll"]:
               dll_path = os.path.join(basedir, ".libs", dll)
               if os.path.exists(dll_path):
                   print(f"load {dll_path}...")