cmake: Fix macOS 15 python build

google · Dec 16, 2024 · 84e6fc0 · 84e6fc0
1 parent 200ade0
commit 84e6fc0
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 34 deletions.
diff --git a/ortools/algorithms/python/CMakeLists.txt b/ortools/algorithms/python/CMakeLists.txt
@@ -22,9 +22,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET knapsack_solver_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(knapsack_solver_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
@@ -45,9 +42,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET set_cover_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(set_cover_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"

diff --git a/ortools/constraint_solver/python/CMakeLists.txt b/ortools/constraint_solver/python/CMakeLists.txt
@@ -30,9 +30,9 @@ target_compile_definitions(pywrapcp PUBLIC "PY3")
 if(APPLE)
   set_target_properties(pywrapcp PROPERTIES
     SUFFIX ".so"
-    INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs")
-  set_property(TARGET pywrapcp APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress")
+    INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs"
+  )
+  target_link_options(pywrapcp PRIVATE "LINKER:-undefined,dynamic_lookup")
 elseif(UNIX)
   set_target_properties(pywrapcp PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../${PROJECT_NAME}/.libs")

diff --git a/ortools/graph/python/CMakeLists.txt b/ortools/graph/python/CMakeLists.txt
@@ -19,7 +19,6 @@ if(APPLE)
   set_target_properties(linear_sum_assignment_pybind11 PROPERTIES
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
-    LINK_FLAGS "-flat_namespace -undefined suppress"
     )
 elseif(UNIX)
   set_target_properties(linear_sum_assignment_pybind11 PROPERTIES
@@ -37,7 +36,6 @@ if(APPLE)
   set_target_properties(max_flow_pybind11 PROPERTIES
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
-    LINK_FLAGS "-flat_namespace -undefined suppress"
     )
 elseif(UNIX)
   set_target_properties(max_flow_pybind11 PROPERTIES
@@ -55,7 +53,6 @@ if(APPLE)
   set_target_properties(min_cost_flow_pybind11 PROPERTIES
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
-    LINK_FLAGS "-flat_namespace -undefined suppress"
     )
 elseif(UNIX)
   set_target_properties(min_cost_flow_pybind11 PROPERTIES

diff --git a/ortools/init/python/CMakeLists.txt b/ortools/init/python/CMakeLists.txt
@@ -21,9 +21,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET init_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(init_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"

diff --git a/ortools/linear_solver/python/CMakeLists.txt b/ortools/linear_solver/python/CMakeLists.txt
@@ -29,9 +29,9 @@ target_compile_definitions(pywraplp PUBLIC "PY3")
 if(APPLE)
   set_target_properties(pywraplp PROPERTIES
     SUFFIX ".so"
-    INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs")
-  set_property(TARGET pywraplp APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress")
+    INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs"
+  )
+  target_link_options(pywraplp PRIVATE "LINKER:-undefined,dynamic_lookup")
 elseif(UNIX)
   set_target_properties(pywraplp PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../${PROJECT_NAME}/.libs")
@@ -59,9 +59,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET model_builder_helper_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(model_builder_helper_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"

diff --git a/ortools/math_opt/core/python/CMakeLists.txt b/ortools/math_opt/core/python/CMakeLists.txt
@@ -22,9 +22,6 @@ if(APPLE)
     INSTALL_RPATH
       "@loader_path;@loader_path/../../../../${PYTHON_PROJECT}/.libs;@loader_path/../../../../pybind11_abseil"
     )
-  set_property(TARGET math_opt_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(math_opt_pybind11 PROPERTIES
     INSTALL_RPATH

diff --git a/ortools/pdlp/python/CMakeLists.txt b/ortools/pdlp/python/CMakeLists.txt
@@ -19,7 +19,6 @@ if(APPLE)
   set_target_properties(pdlp_pybind11 PROPERTIES
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
-    LINK_FLAGS "-flat_namespace -undefined suppress"
     )
 elseif(UNIX)
   set_target_properties(pdlp_pybind11 PROPERTIES

diff --git a/ortools/sat/python/CMakeLists.txt b/ortools/sat/python/CMakeLists.txt
@@ -21,9 +21,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET swig_helper_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(swig_helper_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"

diff --git a/ortools/scheduling/python/CMakeLists.txt b/ortools/scheduling/python/CMakeLists.txt
@@ -21,9 +21,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET rcpsp_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(rcpsp_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"

diff --git a/ortools/util/python/CMakeLists.txt b/ortools/util/python/CMakeLists.txt
@@ -21,9 +21,6 @@ if(APPLE)
     SUFFIX ".so"
     INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
     )
-  set_property(TARGET sorted_interval_list_pybind11 APPEND PROPERTY
-    LINK_FLAGS "-flat_namespace -undefined suppress"
-    )
 elseif(UNIX)
   set_target_properties(sorted_interval_list_pybind11 PROPERTIES
     INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"