diff --git a/CMakeLists.txt b/CMakeLists.txt index 8227298..c0eb354 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,7 +222,7 @@ ELSE() ENDIF() ENDIF() -IF(BUILD_METIS) +IF(BUILD_METIS OR USE_VCPKG_METIS) set(SuiteSparse_LINKER_METIS_LIBS "metis") else() set(SuiteSparse_LINKER_METIS_LIBS "") diff --git a/SuiteSparse/CMakeLists.txt b/SuiteSparse/CMakeLists.txt index 7361363..8a48cf3 100644 --- a/SuiteSparse/CMakeLists.txt +++ b/SuiteSparse/CMakeLists.txt @@ -10,7 +10,11 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") IF (BUILD_METIS) INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") ELSE (BUILD_METIS) + IF(USE_VCPKG_METIS) + INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") + ELSE (USE_VCPKG_METIS) ADD_DEFINITIONS(-DNPARTITION) + ENDIF(USE_VCPKG_METIS) ENDIF ( BUILD_METIS) # Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms.