From 7a6567b7c1e73a1104a2b9f6f5219fe4ff30861f Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Sun, 2 Jul 2023 08:12:30 +0200
Subject: [PATCH] fix python config

---
 cmake/python.cmake         | 3 ++-
 ortools/python/setup.py.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/python.cmake b/cmake/python.cmake
index 4c57340b97d..e0f381cb888 100644
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -251,6 +251,7 @@ file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/glop/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/graph/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/graph/python/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/init/__init__.py CONTENT "")
+file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/init/python/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/python/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/packing/__init__.py CONTENT "")
@@ -317,7 +318,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E $<IF:$<STREQUAL:$<TARGET_PROPERTY:ortools,TYPE>,SHARED_LIBRARY>,copy,true>
   $<$<STREQUAL:$<TARGET_PROPERTY:ortools,TYPE>,SHARED_LIBRARY>:$<TARGET_SONAME_FILE:ortools>>
   ${PYTHON_PROJECT}/.libs
-  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:pywrapinit> ${PYTHON_PROJECT}/init
+  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:pywrapinit> ${PYTHON_PROJECT}/init/python
   COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:pywrapknapsack_solver> ${PYTHON_PROJECT}/algorithms/python
   COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:linear_sum_assignment_pybind11> ${PYTHON_PROJECT}/graph/python
   COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:max_flow_pybind11> ${PYTHON_PROJECT}/graph/python
diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in
index b01f3b9d40c..9fce3c4cf5c 100644
--- a/ortools/python/setup.py.in
+++ b/ortools/python/setup.py.in
@@ -49,7 +49,7 @@ setup(
     ],
     package_data={
         '@PYTHON_PROJECT@':[$<$<STREQUAL:$<TARGET_PROPERTY:@PROJECT_NAME@,TYPE>,SHARED_LIBRARY>:'.libs/*','../$<TARGET_SONAME_FILE_NAME:@PROJECT_NAME@>'>],
-        '@PYTHON_PROJECT@.init':['$<TARGET_FILE_NAME:pywrapinit>'],
+        '@PYTHON_PROJECT@.init.python':['$<TARGET_FILE_NAME:pywrapinit>'],
         '@PYTHON_PROJECT@.algorithms.python':['$<TARGET_FILE_NAME:pywrapknapsack_solver>'],
         '@PYTHON_PROJECT@.bop':['*.pyi'],
         '@PYTHON_PROJECT@.glop':['*.pyi'],