diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/metis | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
Diffstat (limited to 'ports/metis')
| -rw-r--r-- | ports/metis/CONTROL | 2 | ||||
| -rw-r--r-- | ports/metis/install-metisConfig.patch | 44 | ||||
| -rw-r--r-- | ports/metis/portfile.cmake | 2 |
3 files changed, 47 insertions, 1 deletions
diff --git a/ports/metis/CONTROL b/ports/metis/CONTROL index 3ddfbb788..c47b9d85e 100644 --- a/ports/metis/CONTROL +++ b/ports/metis/CONTROL @@ -1,4 +1,4 @@ Source: metis
-Version: 5.1.0-5
+Version: 5.1.0-6
Homepage: https://glaros.dtc.umn.edu/gkhome/metis/metis/overview
Description: Serial Graph Partitioning and Fill-reducing Matrix Ordering
diff --git a/ports/metis/install-metisConfig.patch b/ports/metis/install-metisConfig.patch new file mode 100644 index 000000000..c07600a85 --- /dev/null +++ b/ports/metis/install-metisConfig.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b9613a7..e43ffee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,3 +22,23 @@ include_directories(include) + add_subdirectory("include") + add_subdirectory("libmetis") + # add_subdirectory("programs") ++ ++if(METIS_INSTALL) ++ set(PRJ_NAME metis) ++ set(PRJ_VER 5.1.0) ++ install(EXPORT metisTargets ++ FILE ${PRJ_NAME}Targets.cmake ++ DESTINATION lib/cmake/${PRJ_NAME}) ++ include(CMakePackageConfigHelpers) ++ write_basic_package_version_file( ++ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake ++ VERSION ${PRJ_VER} ++ COMPATIBILITY SameMajorVersion) ++ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake ++ "include(\${CMAKE_CURRENT_LIST_DIR}/${PRJ_NAME}Targets.cmake)") ++ install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake ++ DESTINATION lib/cmake/${PRJ_NAME}) ++endif() ++ +diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt +index 7a5fc74..5a68cf0 100644 +--- a/libmetis/CMakeLists.txt ++++ b/libmetis/CMakeLists.txt +@@ -9,8 +9,9 @@ if(UNIX) + endif() + + if(METIS_INSTALL) +- install(TARGETS metis ++ install(TARGETS metis EXPORT metisTargets + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION lib ++ INCLUDES DESTINATION include) + endif() diff --git a/ports/metis/portfile.cmake b/ports/metis/portfile.cmake index ec17f0dc3..1ba641bcb 100644 --- a/ports/metis/portfile.cmake +++ b/ports/metis/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_extract_source_archive_ex( fix-metis-vs14-math.patch
fix-gklib-vs14-math.patch
fix-linux-build-error.patch
+ install-metisConfig.patch
)
vcpkg_configure_cmake(
@@ -32,6 +33,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/metis)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|