wip

Author: galabovaa

cmake/FindHipoDeps.cmake

@@ -145,25 +145,20 @@ endif()
 set(METIS_ROOT "" CACHE STRING "Root directory of METIS")
 message(STATUS "METIS_ROOT is " ${METIS_ROOT})
 
-if (PYTHON_BUILD_SETUP)
-
+if (PYTHON_BUILD_SETUP AND NOT (METIS_ROOT STREQUAL ""))
     set(METIS_SRC_DIR ${METIS_ROOT})
     set(METIS_DST_DIR ${CMAKE_BINARY_DIR}/metis)
-
     file(COPY ${METIS_SRC_DIR}/include DESTINATION ${METIS_DST_DIR})
     file(COPY ${METIS_SRC_DIR}/lib DESTINATION ${METIS_DST_DIR})
-
     return()
-
 endif()
 
-
 # If a METIS install was specified try to use it first.
 if (NOT (METIS_ROOT STREQUAL ""))
     message(STATUS "Looking for METIS CMake targets file in " ${METIS_ROOT})
     find_package(metis CONFIG NO_DEFAULT_PATH QUIET)
 else()
-    find_package(metis CONFIG QUIET)
+    find_package(metis CONFIG)
 endif()
 
 if(metis_FOUND)

cmake/python-highs.cmake

@@ -56,9 +56,13 @@ python_add_library(_core MODULE highs/highs_bindings.cpp WITH_SOABI)
 target_link_libraries(_core PRIVATE pybind11::headers)
 
 if (HIPO)
-  target_include_directories(_core PRIVATE ${METIS_DST_DIR}/include)
   target_link_libraries(_core PRIVATE OpenBLAS::OpenBLAS)
-  target_link_libraries(_core PRIVATE ${METIS_DST_DIR}/lib/metis.lib)
+  if (NOT METIS_ROOT STREQUAL "")
+    target_include_directories(_core PRIVATE ${METIS_DST_DIR}/include)
+    target_link_libraries(_core PRIVATE ${METIS_DST_DIR}/lib/metis.lib)
+  else()
+    target_link_libraries(_core PRIVATE metis)
+  endif()
 endif()
 
 # sources for python